yumeng 1 viikko sitten
vanhempi
commit
38410b683d

+ 2 - 0
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/MaterialStareMapper.java

@@ -221,4 +221,6 @@ public interface MaterialStareMapper {
     Set<String> getSaleDirctorItsTeamMember(@Param("userId") String userId);
 
     String getOperatLeaderRole(@Param("userId") String userId);
+
+    Set<String> getUsersByLeaderId(@Param("userId") String userId);
 }

+ 6 - 0
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialStareMapper.xml

@@ -3537,5 +3537,11 @@
             FROM `jeecg-boot`.sys_user
             WHERE id = #{userId} LIMIT 1)
     </select>
+    <select id="getUsersByLeaderId" resultType="java.lang.String">
+        select id
+        from `jeecg-boot`.sys_user
+        where leader_id = #{userId}
+          and status = 1
+    </select>
 
 </mapper>

+ 10 - 12
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialStareServiceImpl.java

@@ -2001,19 +2001,17 @@ public class MaterialStareServiceImpl implements MaterialStareService {
         }*/
 
         Set<String> result;
-        //查询当前用户是否存在下级
-        Set<String> subordinate = materialStareMapper.getAffiliateId(userId, null);
-        if (subordinate.isEmpty()) {
-            if ("admin".equals(roleCode)) {
-                return materialStareMapper.getCompanyAllUserId(null);
-            }
-            subordinate.add(userId);
-            return subordinate;
-        } else {
-            //获取其下组员
-            result = materialStareMapper.getSaleDirctorItsTeamMember(userId);
-            result.add(userId);
+        if ("admin".equals(roleCode)) {
+            return materialStareMapper.getCompanyAllUserId(null);
+        }
+        result = materialStareMapper.getSaleDirctorItsTeamMember(userId);
+        if(Check.isNull(result)){
+            result =  materialStareMapper.getUsersByLeaderId(userId);
         }
+        result.add(userId);
+
+
+
         return result;
     }