bugfix

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

@@ -338,14 +338,6 @@ public class KwsEnterpriseService {
         List<Integer> currentTypeList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(listByEntId)) {
             currentTypeList.addAll(listByEntId.stream().map(KwsEntType::getType).toList());
-//            for (KwsEntType listId : listByEntId) {
-//                KwsEntType kwsEntType = new KwsEntType();
-//                kwsEntType.setId(listId.getId());
-//                kwsEntType.setDelFlag(Global.YES);
-//                if (kwsEntTypeDao.update(kwsEntType) <= 0) {
-//                    throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
-//                }
-//            }
         }
         List<String> typeList = Arrays.stream(reqVo.getEntTypes().split(",")).toList();
         for (String item : typeList) {
@@ -514,25 +506,17 @@ public class KwsEnterpriseService {
                 kwsMenuRightsDao.deleteByIds(kwsMenuRightsList.stream().map(KwsMenuRights::getId).collect(Collectors.toList()));
             }
 
-            Date date = new Date();
             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))).collect(Collectors.toList());
+                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.setStatus(0);
-                    kwsMenuRights.setCreateBy(LoginUserHolder.getUserId());
-                    kwsMenuRights.setCreateTime(date);
-                    kwsMenuRights.setUpdateBy(LoginUserHolder.getUserId());
-                    kwsMenuRights.setUpdateTime(date);
-                    kwsMenuRights.setDelFlag(0);
-                    kwsMenuRights.setRemark("");
                     kwsMenuRightsList2.add(kwsMenuRights);
                 }
             }
@@ -728,11 +712,10 @@ public class KwsEnterpriseService {
             BeanUtils.copyProperties(reqVo, entRegisterReqVo);
             entRegisterReqVo.setEntId(register.getEntId());
             register(entRegisterReqVo);
-
-            ApprovalReqVo approvalReqVo = new ApprovalReqVo();
-            approvalReqVo.setEntId(register.getEntId());
-            approvalReqVo.setStatus(ApprovalEnum.OK.getCode());
-            approval(approvalReqVo);
+//            ApprovalReqVo approvalReqVo = new ApprovalReqVo();
+//            approvalReqVo.setEntId(register.getEntId());
+//            approvalReqVo.setStatus(ApprovalEnum.OK.getCode());
+//            approval(approvalReqVo);
             return;
         }
 

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

@@ -92,7 +92,7 @@ public class KwsUserService {
         BeanUtils.copyProperties(reqVo, kwsUser);
         kwsUser.setPhone(kwsUser.getAccount());
         kwsUser.setIsMain(Global.NO);
-        kwsUser.setSystemType(SystemTypeEnum.COMPANY.getCode());
+        kwsUser.setSystemType(kwsUser.getSystemType());
 
         /*1、数据校验*/
         checkAccountValid(kwsUser.getAccount(), kwsUser.getSystemType());

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

@@ -207,4 +207,7 @@
      and a.del_flag = 0 and a.status = 0
   </select>
 
+
+
+
 </mapper>