bugfix

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

@@ -496,28 +496,35 @@ public class KwsEnterpriseService {
                     }
                     kwsUserService.fillUserRole(String.valueOf(findManagePojo.getRoleId()), userByAccount.getId(), SystemTypeEnum.COMPANY.getCode());
                 }
-            }
 
-            List<KwsMenuRights> kwsMenuRightsList = kwsMenuRightsDao.selectEntMenus(entId);
-            if (CollectionUtils.isNotEmpty(kwsMenuRightsList)) {
-                kwsMenuRightsDao.deleteByIds(kwsMenuRightsList.stream().map(KwsMenuRights::getId).collect(Collectors.toList()));
-            }
+                List<KwsMenuRights> kwsMenuRightsList = kwsMenuRightsDao.selectEntMenus(entId);
+                if (CollectionUtils.isNotEmpty(kwsMenuRightsList)) {
+                    kwsMenuRightsDao.deleteByIds(kwsMenuRightsList.stream().map(KwsMenuRights::getId).collect(Collectors.toList()));
+                }
 
-            List<KwsEntType> listByEntId = kwsEntTypeDao.findListByEntId(entId);
-            List<Integer> typeList = listByEntId.stream().map(KwsEntType::getType).toList();
-            List<KwsMenu> kwsMenus = kwsMenuDao.selectAll();
-            List<KwsMenuRights> kwsMenuRightsList2 = new ArrayList<>();
-            for (Integer entType : typeList) {
-                List<KwsMenu> collect = kwsMenus.stream().filter(item -> item.getUsingRoles().contains(String.valueOf(entType))).toList();
-                for (KwsMenu kwsMenu : collect) {
-                    KwsMenuRights kwsMenuRights = new KwsMenuRights();
-                    kwsMenuRights.setEntId(entId);
-                    kwsMenuRights.setMenuId(kwsMenu.getId());
-                    kwsMenuRights.setId(new IdWorker(1L).nextId());
-                    kwsMenuRightsList2.add(kwsMenuRights);
+                List<KwsEntType> listByEntId = kwsEntTypeDao.findListByEntId(entId);
+                List<Integer> typeList = listByEntId.stream().map(KwsEntType::getType).toList();
+                List<KwsMenu> kwsMenus = kwsMenuDao.selectAll();
+                List<KwsMenuRights> kwsMenuRightsList2 = new ArrayList<>();
+                Date date = new Date();
+                for (Integer entType : typeList) {
+                    List<KwsMenu> collect = kwsMenus.stream().filter(item -> item.getUsingRoles().contains(String.valueOf(entType))).toList();
+                    for (KwsMenu kwsMenu : collect) {
+                        KwsMenuRights kwsMenuRights = new KwsMenuRights();
+                        kwsMenuRights.setEntId(entId);
+                        kwsMenuRights.setMenuId(kwsMenu.getId());
+                        kwsMenuRights.setId(new IdWorker(1L).nextId());
+                        kwsMenuRights.setCreateBy(LoginUserHolder.getUserId());
+                        kwsMenuRights.setUpdateBy(LoginUserHolder.getUserId());
+                        kwsMenuRights.setCreateTime(date);
+                        kwsMenuRights.setUpdateTime(date);
+                        kwsMenuRights.setDelFlag(Global.NO);
+                        kwsMenuRights.setStatus(Global.NO);
+                        kwsMenuRightsList2.add(kwsMenuRights);
+                    }
                 }
+                kwsMenuRightsDao.saveBatch(kwsMenuRightsList2);
             }
-            kwsMenuRightsDao.saveBatch(kwsMenuRightsList2);
         }
         commonService.updateEntCertificate(entId, BeanUtils.copyToList(kwsEntCertificates, EntCertificateInfo.class));