bugfix

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -148,9 +148,6 @@ public class KwsEnterpriseService {
         kwsRoleService.deleteByDeptIds(list);
     }
 
-    public static void main(String[] args) {
-    }
-
     /**
      * @param reqVo 更新记录入参
      * @desc: 更新记录, 有的是更新有的是新增, 两种情况
@@ -324,7 +321,9 @@ public class KwsEnterpriseService {
         kwsEnterprise.setOrgCode("");
         kwsEnterprise.setRegTime(date);
         kwsEnterprise.setUpdateBy(LoginUserHolder.getUserId());
-        kwsEnterprise.setApproval(kwsEnterprise.getApproval().equals(ApprovalEnum.OK.getCode()) ? ApprovalEnum.REFRESH.getCode() : ApprovalEnum.PROCESS.getCode());
+
+        List<KwsEntCheckTrack> list = kwsEntCheckTrackDao.findList(entId);
+        kwsEnterprise.setApproval(list.stream().anyMatch(item -> item.getStatus().equals(Global.NO)) ? ApprovalEnum.REFRESH.getCode() : ApprovalEnum.PROCESS.getCode());
         if (kwsEnterpriseDao.update(kwsEnterprise) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
@@ -432,6 +431,7 @@ public class KwsEnterpriseService {
     private void checkRegisterParam(EntRegisterReqVo reqVo) {
     }
 
+
     /**
      * 企业审批
      */

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -284,13 +284,11 @@
     from kws_enterprise a
            left join kws_dept b on a.id = b.ent_id
            LEFT JOIN kws_user d ON a.phone = d.account
-           left join kws_user_role e on d.id = e.user_id
-           left join kws_role f on e.role_id = f.id
+           left join kws_role f on b.id = f.dept_id
     where a.del_flag = 0
       and b.del_flag = 0
       and d.del_flag = 0
       and f.del_flag = 0
-      and e.del_flag = 0
       and d.is_main = 1
       and d.system_type = 2
       and a.id = #{entId}