فهرست منبع

1. 因为部分企业没有绑定联系人,导致汇总接口空指针
2. 汇总后分发,可以选择所有部门

wangjiang 2 سال پیش
والد
کامیت
cfcef9ec6b

+ 10 - 7
src/main/java/platform/modules/sys/service/DepartmentService.java

@@ -179,13 +179,16 @@ public class DepartmentService extends BaseService<Department> {
 
             }
 
-            if (null != nextCheckers && nextCheckers.size() > 0) {
-                //PageHelper.startPage(pageNum, pageSize);
-                departments = departmentDao.findDepartmentByGroupNamePageInfo(Constant.HGXSHXZ, keyWords, set);
-            } else {
-                //PageHelper.startPage(pageNum, pageSize);
-                departments = departmentDao.findDepartmentByGroupNamePageInfo(Constant.HGXSHXZ, keyWords, null);
-            }
+//            if (null != nextCheckers && nextCheckers.size() > 0) {
+//                //PageHelper.startPage(pageNum, pageSize);
+//                departments = departmentDao.findDepartmentByGroupNamePageInfo(Constant.HGXSHXZ, keyWords, set);
+//            } else {
+//                //PageHelper.startPage(pageNum, pageSize);
+//                departments = departmentDao.findDepartmentByGroupNamePageInfo(Constant.HGXSHXZ, keyWords, null);
+//            }
+            // 合规性审查补发,也可以选择所有部门
+            departments = departmentDao.findDepartmentByGroupNamePageInfo(Constant.HGXSHXZ, keyWords, null);
+
         }
 
         return departments;

+ 2 - 1
src/main/resources/mapper/build/CompanyDao.xml

@@ -779,7 +779,8 @@
             LEFT JOIN z_user u ON u.company_id = c.id
             LEFT JOIN y_company_contact cc ON cc.company_id = c.id
         WHERE
-            c.del_flag = 0 AND cc.del_flag = 0  AND u.id = #{userId}
+            c.del_flag = 0
+          AND u.id = #{userId}
         limit 1
     </select>