解决冲突

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

@@ -8,6 +8,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.dao.KwsEntCheckTrackDao;
+import com.sckw.system.dao.KwsEnterpriseDao;
 import com.sckw.system.dao.KwsUserDao;
 import com.sckw.system.dao.KwsUserDeptDao;
 import com.sckw.system.model.KwsDept;
@@ -50,7 +51,7 @@ public class KwsUserService {
     KwsDeptService kwsDeptService;
 
     @Autowired
-    KwsEnterpriseService kwsEnterpriseService;
+    KwsEnterpriseDao kwsEnterpriseDao;
 
     @Autowired
     KwsMenuService kwsMenuService;
@@ -104,7 +105,9 @@ public class KwsUserService {
             kwsEnterprise.setId(entId);
             kwsEnterprise.setFirmName(reqDto.getEntName());
             kwsEnterprise.setApproval(ApprovalEnum.NO.getCode());
-            kwsEnterpriseService.add(kwsEnterprise);
+            if (kwsEnterpriseDao.insert(kwsEnterprise) <= 0) {
+                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+            }
 
             /*4、新增管理员机构*/
             KwsDept kwsDept = new KwsDept();