zhouzeyu@c-top.com.cn 3 سال پیش
والد
کامیت
5e969f0bab

+ 0 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/MaterialReportOverViewV2Controller.java

@@ -60,9 +60,7 @@ public class MaterialReportOverViewV2Controller {
             result.error500("userId is empty");
             return result;
         }
-        //查询所有包含自己的下级
         List<JSONObject> list = materialReportOverViewService.getDesignTeamList(userId, mediaId);
-        //查询并返回所有关联的项目
         result.setResult(list);
         result.setSuccess(true);
         return result;

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

@@ -193,4 +193,6 @@ public interface MaterialReportOverViewV3Mapper {
     JSONObject getKuaishouMaterialCountByLable(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("projects") JSONArray projects, @Param("dimension") String dimension, @Param("leaderId") String leaderId, @Param("designerId") String designerId, @Param("companyId") String companyId);
 
     JSONObject getKuaishouMaterialCountByCost(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("projects") JSONArray projects, @Param("dimension") String dimension, @Param("leaderId") String leaderId, @Param("designerId") String designerId, @Param("companyId") String companyId);
+
+    List<JSONObject> getDesignTeamALLList();
 }

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

@@ -17,6 +17,11 @@
         where t.id=#{userId})
     </select>
 
+    <select id="getDesignTeamALLList"  resultType="com.alibaba.fastjson.JSONObject">
+        SELECT id,depart_name as departName,leader_id as leaderId,leader_name as leaderName  from
+        application.sys_depart_personal
+    </select>
+
     <select id="recursiveQuerySubordinateByLeaders" resultType="java.lang.String">
         SELECT distinct id
         FROM sys_user

+ 9 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialReportOverViewV2ServiceImpl.java

@@ -62,7 +62,15 @@ public class MaterialReportOverViewV2ServiceImpl implements IMaterialReportOverV
      */
     @Override
     public List<JSONObject> getDesignTeamList(String userId, int mediaId) {
-        List<JSONObject> designTeamList = materialReportOverViewV3Mapper.getDesignTeamList(userId);
+        String roleCode = roleService.getRoleCodeByUserId(userId);
+        List<JSONObject> designTeamList=new ArrayList<>();
+        if ("admin".equals(roleCode) ) {
+            //管理员查询全部部门
+            designTeamList = materialReportOverViewV3Mapper.getDesignTeamALLList();
+        } else {
+            designTeamList = materialReportOverViewV3Mapper.getDesignTeamList(userId);
+        }
+
         if (designTeamList != null && !designTeamList.isEmpty()) {
             //判断是否默认选中
             for (JSONObject jsonObject : designTeamList) {