Redeem 1 рік тому
батько
коміт
6b72385163

+ 2 - 0
src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -54,6 +54,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             Map<String, Object> userInfo = (Map<String, Object>) dataMap.get("user");
             // 根据用户名去查询该用户绑定的公司及下属公司;7.2改为只查本单位因前端会报错
             List<Map<String, Object>> companyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
+
             //List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
             if(companyList != null && companyList.size() > 0) {
                 Map<String, Object> stringMap = new HashMap<>();
@@ -67,6 +68,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
                 //return resMap;
             }
             Map<String,Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
+            //根据companyList查询名字相同的
             userInfo.put("dilCompanyList", companyList);
             if (rootCompanyMap != null && rootCompanyMap.get("isListed") != null) {
                 userInfo.put("rootCompanyMap",rootCompanyMap);

+ 6 - 2
src/main/resources/com/steerinfo/dil/mapper/BackgroundProcessingMapper.xml

@@ -37,7 +37,11 @@
         order by "level"
     </select>
     <select id="getCurrentCompanyList" resultType="java.util.Map">
-        SELECT distinct rc.company_id "companyId"
+        SELECT
+        RC.COMPANY_ID "companyId"
+        FROM RMS_COMPANY RC
+        WHERE RC.COMPANY_NAME IN (
+        SELECT distinct rc.COMPANY_NAME
         FROM RMS_PERSONNEL RP
         LEFT JOIN RMS_PERSONNEL_COMPANY RPC
         on RP.PERSONNEL_ID = RPC.PERSONNEL_ID
@@ -46,7 +50,7 @@
         WHERE
         RPC.DELETED = 0
         AND
-        RP.PERSONNEL_JOB_NUMBER = #{userName}
+        RP.PERSONNEL_JOB_NUMBER = #{userName})
     </select>
     <select id="getCompanyRootMap" resultType="java.util.Map">
         SELECT DISTINCT