企业认证等bug修改

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -105,6 +105,10 @@ public class OwnAuthController extends BaseController {
     private RemoteSystemService remoteSystemService;
     @Autowired
     private IMessageUtilsService messageUtilsService;
+    @Autowired
+    private IPubFileInfService pubFileInfService;
+    @Autowired
+    private FlowableService flowableService;
     /**
      * CFCA (是否开启生产环境配置 true 开启 false 关闭)
      */
@@ -181,8 +185,7 @@ public class OwnAuthController extends BaseController {
      * 用户注册成功
      */
     private String zhucechenggong = "zhucechenggong";
-    @Autowired
-    private FlowableService flowableService;
+
     /**
      * 新增企业认证
      *
@@ -260,7 +263,7 @@ public class OwnAuthController extends BaseController {
         //经办人姓名
         String handler = null;
         //是否法人亲办
-        if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+        if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
              handler = CommonUtil.objToString(map.get("handler"));
             if(CommonUtil.isEmpty(scyLegalId)){
                 return R.fail("经办人名称不能为空");
@@ -269,7 +272,7 @@ public class OwnAuthController extends BaseController {
         //经办人身份证号
         String handlerCard = null;
         //是否法人亲办
-        if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+        if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
             handlerCard = CommonUtil.objToString(map.get("handlerCard"));
             if(CommonUtil.isEmpty(handlerCard)){
                 return R.fail("经办人身份证不能为空");
@@ -308,14 +311,14 @@ public class OwnAuthController extends BaseController {
         List<Map<String, String>> jsfzfList =null;
         //经办人身份证人像面
         jsfzzList = CommonUtil.objToString(map.get("jsfzzList"));
-        if("1".equals(CommonUtil.objToString(map.get("legalHandle")))) {
+        if("1".equals(CommonUtil.objToString(map.get("legalHandles")))) {
             if(CommonUtil.isEmpty(jsfzzList)){
                 return R.fail("经办人身份证人像面不能为空");
             }
         }
         //经办人身份证国徽面
         jsfzfList = (List<Map<String, String>>) map.get("jsfzfList");
-        if("1".equals(CommonUtil.objToString(map.get("legalHandle")))) {
+        if("1".equals(CommonUtil.objToString(map.get("legalHandles")))) {
             if(jsfzfList.size()==0){
                 return R.fail("经办人身份证国徽面不能为空");
             }
@@ -362,7 +365,7 @@ public class OwnAuthController extends BaseController {
         /*JSONObject operatorAuth = new JSONObject();
         operatorAuth.put("Message", "SUCCESS");
         operatorAuth.put("Verification", "20");*/
-        if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+        if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
             operatorAuth=  CfcaUtil.operatorAuth(ISPRO, INSTITUTIONID, handler, IDENTIFICATIONTYPE, handlerCard, phoneNumber, zbiRemark);
         }else{
             operatorAuth=  CfcaUtil.operatorAuth(ISPRO, INSTITUTIONID, scyLegal, IDENTIFICATIONTYPE, scyLegalId, phoneNumber, zbiRemark);
@@ -387,8 +390,8 @@ public class OwnAuthController extends BaseController {
         //状态(00:正常, 01:停用, 02:待四要素认证(认证中), 03:待对公户认证(认证中), 04:待实名审核(认证中), 99:删除)
         SysCompany.setScyStatus("03");
         //四要素认证状态(00:未认证, 01:认证通过, 02:认证未通过, 03:人工审批通过, 04:人工审批不通过)
-        if("SUCCESS".equals(operatorAuth.getString("Message"))){
-            if(!"20".equals(operatorAuth.getString("Verification"))){
+        if("SUCCESS".equals(companyAuth.getString("Message"))){
+            if(!"20".equals(companyAuth.getString("Verification"))){
                 SysCompany.setScyAuthStatus("02");
             }else{
                 SysCompany.setScyAuthStatus("01");
@@ -406,6 +409,9 @@ public class OwnAuthController extends BaseController {
                 if(!scyName.equals(name)){
                     throw new Exception("企业名称与社会同一信用代码不一致!");
                 }
+                SysCompany.setScyAuthStatus("01");
+            }else{
+                SysCompany.setScyAuthStatus("02");
             }
         }
 
@@ -477,7 +483,7 @@ public class OwnAuthController extends BaseController {
             // 修改用户数据
             OwnSysUser sysUser = new OwnSysUser();
             sysUser.setUserId(String.valueOf(use.getUserId()));
-            if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+            if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                 sysUser.setNickName(handler);
             }else{
                 sysUser.setNickName(scyLegal);
@@ -490,7 +496,7 @@ public class OwnAuthController extends BaseController {
             sysUserCompanyRel.setSucrUserId(use.getUserId());
             sysUserCompanyRel.setSucrDeptId(deptId);
             sysUserCompanyRel.setSucrHandler("1");
-            if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+            if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                 sysUserCompanyRel.setSucrCard(handlerCard);
             }else{
                 sysUserCompanyRel.setSucrCard(scyLegalId);
@@ -508,7 +514,7 @@ public class OwnAuthController extends BaseController {
             if(handlerUser == null){
                 SysUser sysUser = new SysUser();
                 sysUser.setUserName(phoneNumber);
-                if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+                if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUser.setNickName(handler);
                 }else{
                     sysUser.setNickName(scyLegal);
@@ -529,7 +535,7 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrUserId(handlerUser.getUserId());
                 sysUserCompanyRel.setSucrDeptId(deptId);
                 sysUserCompanyRel.setSucrHandler("1");
-                if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+                if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUserCompanyRel.setSucrCard(handlerCard);
                 }else{
                     sysUserCompanyRel.setSucrCard(scyLegalId);
@@ -539,17 +545,16 @@ public class OwnAuthController extends BaseController {
                     sysUserCompanyRel.setSucrCardBackFile(jsfzfList.get(0).get("uid"));
                 }
                 sysUserCompanyRelService.saveOrUpdate(sysUserCompanyRel);
-            // 经办人不存在
+            // 经办人存在
             } else {
                 // TODO多公司用户名字存在不一样问题
                 OwnSysUser sysUser = new OwnSysUser();
                 sysUser.setUserId(String.valueOf(use.getUserId()));
-                if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+                if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUser.setNickName(handler);
                 }else{
                     sysUser.setNickName(scyLegal);
                 }
-                sysUser.setRoleIds(roleIds);
                 userService.updateUser(sysUser);
                 // 新增角色
                 handlerUser.setRoleIds(roleIds);
@@ -561,7 +566,7 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrUserId(handlerUser.getUserId());
                 sysUserCompanyRel.setSucrDeptId(deptId);
                 sysUserCompanyRel.setSucrHandler("1");
-                if("1".equals(CommonUtil.objToString(map.get("legalHandle")))){
+                if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUserCompanyRel.setSucrCard(handlerCard);
                 }else{
                     sysUserCompanyRel.setSucrCard(scyLegalId);
@@ -583,35 +588,44 @@ public class OwnAuthController extends BaseController {
 
         //创建其他和管理员
         SysUser operatorUser = null;
+
         if(CommonUtil.isNotEmpty(operator) && CommonUtil.isNotEmpty(number)){
-            Long  operatorUserId = null;
-            operatorUser = userService.selectUserByUserName(number);
-            if(operatorUser == null) {
-                SysUser user = new SysUser();
-                user.setUserName(number);
-                user.setNickName(operator);
-                String password = configService.selectConfigByKey("sys.user.initPassword");
-                user.setPassword(SecurityUtils.encryptPassword(password));
-                user.setCreateBy(use.getUserId() + "");
-                user.setRoleIds(roleIds);
-                userService.insertUser(user);
-                //发送注册成功短信
-                Map passwordMap =new HashMap();
-                passwordMap.put("password",password);
-                messageUtilsService.sendMessageCode(phoneNumber,zhucechenggong,passwordMap,null);
-                operatorUser = userService.selectUserByUserName(number);
+            //经办人与其他管理员身份不一致才会进入
+            String duiName =null;
+            if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
+                duiName = handler;
             }else{
-                operatorUser.setRoleIds(roleIds);
-                userService.insertUserRole(operatorUser);
+                duiName= scyLegal;
             }
-            operatorUserId = operatorUser.getUserId();
+            if(!operator.equals(duiName)){
+                Long operatorUserId = null;
+                operatorUser = userService.selectUserByUserName(number);
+                if (operatorUser == null) {
+                    SysUser user = new SysUser();
+                    user.setUserName(number);
+                    user.setNickName(operator);
+                    String password = configService.selectConfigByKey("sys.user.initPassword");
+                    user.setPassword(SecurityUtils.encryptPassword(password));
+                    user.setCreateBy(use.getUserId() + "");
+                    userService.insertUser(user);
+                    //发送注册成功短信
+                    Map passwordMap = new HashMap();
+                    passwordMap.put("password", password);
+                    messageUtilsService.sendMessageCode(phoneNumber, zhucechenggong, passwordMap, null);
+                    operatorUser = userService.selectUserByUserName(number);
+                } else {
+                    operatorUser.setNickName(operator);
+                    userService.updateUser(operatorUser);
+                }
+                operatorUserId = operatorUser.getUserId();
 
-            SysUserCompanyRel sysUserCompanyRel =new SysUserCompanyRel();
-            sysUserCompanyRel.setSucrCompanyId(scyId);
-            sysUserCompanyRel.setSucrUserId(operatorUserId);
-            sysUserCompanyRel.setSucrDeptId(deptId);
-            sysUserCompanyRel.setSucrHandler("0");
-            sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
+                SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
+                sysUserCompanyRel.setSucrCompanyId(scyId);
+                sysUserCompanyRel.setSucrUserId(operatorUserId);
+                sysUserCompanyRel.setSucrDeptId(deptId);
+                sysUserCompanyRel.setSucrHandler("0");
+                sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
+            }
         }
         //返回企业信息
         SysCompany company = sysCompanyService.getById(scyId);
@@ -743,12 +757,12 @@ public class OwnAuthController extends BaseController {
         String zbiRemark = CommonUtil.objToString(map.get("zbiRemark"));
         //查询银行行号
         LambdaQueryWrapper<ZcCfcaBankInf> queryWrapper = new LambdaQueryWrapper<>();
-//        //所属银行
-//        queryWrapper.eq(ZcCfcaBankInf::getZcbiBankName,pbaiBankName);
-//        List<ZcCfcaBankInf> list = zcCfcaBankInfService.findZcCfcaBankInfs(queryWrapper);
-//        if(list.size()==0){
-//            return R.fail("银行名称错误,请输入正确的银行名");
-//        }
+        //所属银行
+        queryWrapper.eq(ZcCfcaBankInf::getZcbiBankName,pbaiBankName);
+        List<ZcCfcaBankInf> list = zcCfcaBankInfService.findZcCfcaBankInfs(queryWrapper);
+        if(list.size()==0){
+            throw new BaseException("获取银行失败请重新获取银行");
+        }
         //查询账户
         LambdaQueryWrapper<PayBankAccInf> bank = new LambdaQueryWrapper<>();
         //所属银行
@@ -765,6 +779,35 @@ public class OwnAuthController extends BaseController {
             System.out.println("最后时间"+formatter.format(bankAcc.get(0).getPbaiCfcaDate()));
             if(formatter.format(calendar.getTime()).compareTo(formatter.format(bankAcc.get(0).getPbaiCfcaDate()))<0){
                 throw new BaseException("当前账户已存在");
+            }else{
+                //企业打款申请
+                JSONObject operatorAuth = CfcaUtil.paymentApply(ISPRO, INSTITUTIONID, pbaiAccountName, pbaiBankaccountId,list.get(0).getZcbiBankNo(),zbiRemark);
+            /*JSONObject operatorAuth = new JSONObject();
+            operatorAuth.put("Message", "SUCCESS");
+            operatorAuth.put("Status", "20");
+            operatorAuth.put("TxSN", "100000001");*/
+                System.out.print("绑定对公户返回结果==========>" + operatorAuth);
+                String  TxSN =  operatorAuth.getString("TxSN");
+                if("SUCCESS".equals(operatorAuth.getString("Message"))){
+                    if(!"20".equals(operatorAuth.getString("Status"))){
+                        return R.fail("绑定账户失败");
+                    };
+                }else{
+                    return R.fail("绑定账户失败");
+                }
+                PayBankAccInf payBankAccInf = new PayBankAccInf();
+                String  pbiId  =  IdUtils.fastSimpleUUID();
+                payBankAccInf.setPbaiId(pbiId);
+                payBankAccInf.setPbaiCstno(scyId);
+                payBankAccInf.setPbaiAccountName(pbaiAccountName);
+                payBankAccInf.setPbaiBankaccountId(pbaiBankaccountId);
+                payBankAccInf.setPbaiBankName(list.get(0).getZcbiBankName());
+                payBankAccInf.setPbaiStatus("1");
+                payBankAccInf.setPbaiCfcaNo(TxSN);
+                //获取当前时间
+                Date currentTime = DateUtils.getNowDate();
+                payBankAccInf.setPbaiCfcaDate(currentTime);
+                payBankAccInfService.createPayBankAccInf(payBankAccInf);
             }
             }else{
             //企业打款申请
@@ -788,7 +831,7 @@ public class OwnAuthController extends BaseController {
             payBankAccInf.setPbaiCstno(scyId);
             payBankAccInf.setPbaiAccountName(pbaiAccountName);
             payBankAccInf.setPbaiBankaccountId(pbaiBankaccountId);
-            payBankAccInf.setPbaiBankName(pbaiBankName);
+            payBankAccInf.setPbaiBankName(list.get(0).getZcbiBankName());
             payBankAccInf.setPbaiStatus("1");
             payBankAccInf.setPbaiCfcaNo(TxSN);
             //获取当前时间
@@ -931,7 +974,7 @@ public class OwnAuthController extends BaseController {
         String phoneNumber =CommonUtil.objToString(map.get("phone"));
         //验证码
         String code = CommonUtil.objToString(map.get("code"));
-        //企业打款申请
+        //企业短信验证
         JSONObject operatorAuth = CfcaUtil.checkSmsCode(ISPRO, INSTITUTIONID,phone,code,null);
         /*JSONObject operatorAuth = new JSONObject();
         operatorAuth.put("Message", "SUCCESS");
@@ -948,33 +991,37 @@ public class OwnAuthController extends BaseController {
         sysCompany.setScyId(scyId);
         //正常状态
         sysCompany.setScyStatus("00");
-        JSONObject companyAccount =null;
-        //jks路径
-        String jksPath = configService.selectConfigByKey("jks_path");
-        //密码
-        String keyStorePassword = configService.selectConfigByKey("cfca_key_store_password");
-        //渠道
-        String channel = configService.selectConfigByKey("cfca_channel");
-        //platId
-        String platId = configService.selectConfigByKey("cfca_platId");
-        if(CommonUtil.isNotEmpty(handler)) {
-            try {
-                companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, handler, TYPECODE, handlerCard,new HttpConnector(jksPath,keyStorePassword,channel,platId));
-                }catch (Exception e) {
-                throw new Exception("开户失败!");
-                }
-        }else{
-            try {
-                companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, scyLegal, TYPECODE, scyLegalId,new HttpConnector(jksPath,keyStorePassword,channel,platId));
-            }catch (Exception e) {
-                throw new Exception("开户失败!");
-            }
-            }
-        System.out.print("开户结果==========>" + companyAccount);
-        //返回cfca用户id
-        String userId = companyAccount.getJSONObject("enterprise").getString("userId");
-        sysCompany.setScyCfcaUserId(userId);
-        sysCompanyService.updateSysCompany(sysCompany);
+//        JSONObject companyAccount =null;
+//        //jks路径
+//        String jksPath = configService.selectConfigByKey("jks_path");
+//        //密码
+//        String keyStorePassword = configService.selectConfigByKey("cfca_key_store_password");
+//        //渠道
+//        String channel = configService.selectConfigByKey("cfca_channel");
+//        //platId
+//        String platId = configService.selectConfigByKey("cfca_platId");
+//        if(CommonUtil.isNotEmpty(handler)) {
+//            try {
+//                companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, handler, TYPECODE, handlerCard,new HttpConnector(jksPath,keyStorePassword,channel,platId));
+//                }catch (Exception e) {
+//                throw new Exception("开户失败!");
+//                }
+//        }else{
+//            try {
+//                companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, scyLegal, TYPECODE, scyLegalId,new HttpConnector(jksPath,keyStorePassword,channel,platId));
+//            }catch (Exception e) {
+//                throw new Exception("开户失败!");
+//            }
+//            }
+//        System.out.print("开户结果==========>" + companyAccount);
+//        //返回cfca用户id
+//        if(CommonUtil.isNotEmpty(companyAccount.getJSONObject("enterprise").getString("userId"))){
+//            String userId = companyAccount.getJSONObject("enterprise").getString("userId");
+//            sysCompany.setScyCfcaUserId(userId);
+//            sysCompanyService.updateSysCompany(sysCompany);
+//        }else{
+//            throw new Exception("开户失败!");
+//        }
         //查询企业
         LambdaQueryWrapper<SysCompany> company = new LambdaQueryWrapper<>();
         //企业id
@@ -1101,6 +1148,37 @@ public class OwnAuthController extends BaseController {
                 bank.eq(PayBankAccInf::getPbaiCstno,list.getScyId());
                 bank.orderByDesc(PayBankAccInf::getPbaiCfcaDate);
                 List<PayBankAccInf> bankAcc = payBankAccInfService.findPayBankAccInfs(bank);
+                PubFileInf pubFileInf = new PubFileInf();
+                //获取营业执照url
+                if(CommonUtil.isNotEmpty(list.getScyLicenseFile())){
+                    FileInf yyzzUrl = pubFileInfService.getById(list.getScyLicenseFile());
+                    map.put("yyzzUrl",yyzzUrl.getPfiUrl());
+                }
+                //获取法人身份证人像面url
+                if(CommonUtil.isNotEmpty(list.getScyLegalFile())){
+                    FileInf fsfzzUrl = pubFileInfService.getById(list.getScyLegalFile());
+                    map.put("fsfzzUrl",fsfzzUrl.getPfiUrl());
+                }
+                //获取法人身份证国徽面url
+                if(CommonUtil.isNotEmpty(list.getScyLegalBackFile())){
+                    FileInf fsfzfUrl = pubFileInfService.getById(list.getScyLegalBackFile());
+                    map.put("fsfzfUrl",fsfzfUrl.getPfiUrl());
+                }
+                //获取法人授权书url
+                if(CommonUtil.isNotEmpty(list.getScyAuthorizationFile())){
+                    FileInf frsqsUrl = pubFileInfService.getById(list.getScyAuthorizationFile());
+                    map.put("frsqsUrl",frsqsUrl.getPfiUrl());
+                }
+                //获取数字证书授权与承诺书url
+                if(CommonUtil.isNotEmpty(list.getScyCommitmentFile())){
+                    FileInf szzssqUrl = pubFileInfService.getById(list.getScyCommitmentFile());
+                    map.put("szzssqUrl",szzssqUrl.getPfiUrl());
+                }
+                //获取其他附件url
+                if(CommonUtil.isNotEmpty(list.getScyAuthorizationFile())){
+                    FileInf qtfjUrl = pubFileInfService.getById(list.getScyAuthorizationFile());
+                    map.put("qtfjUrl",qtfjUrl.getPfiUrl());
+                }
                 //查询经办人
                 LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
                 sysUserCompanyRel.eq(SysUserCompanyRel::getSucrCompanyId,list.getScyId());
@@ -1109,8 +1187,24 @@ public class OwnAuthController extends BaseController {
                 if (userCompanyRels.size() > 0){
                     SysUser handle = userService.selectUserById(userCompanyRels.get(0).getSucrUserId());
                     map.put("user", handle);
+                    //获取经办人身份证人像面url
+                    if(CommonUtil.isNotEmpty(userCompanyRels.get(0).getSucrCardFile())){
+                        FileInf jsfzzUrl = pubFileInfService.getById(userCompanyRels.get(0).getSucrCardFile());
+                        if(CommonUtil.isNotEmpty(String.valueOf(jsfzzUrl))){
+                            map.put("jsfzzUrl",jsfzzUrl.getPfiUrl());
+                        }
+
+                    }
+                    //获取经办人身份证国徽面url
+                    if(CommonUtil.isNotEmpty(userCompanyRels.get(0).getSucrCardBackFile())){
+                        FileInf jsfzfUrl = pubFileInfService.getById(userCompanyRels.get(0).getSucrCardBackFile());
+                        if(CommonUtil.isNotEmpty(String.valueOf(jsfzfUrl))){
+                            map.put("jsfzfUrl",jsfzfUrl.getPfiUrl());
+                        }
+                    }
                 }
                 map.put("data",bankAcc);
+
                 map.put("userCompany",userCompanyRels);
             }
             return R.ok(map);

tianhu-system/src/main/java/com/tianhu/system/controller/OwnManagementInfController.java

@@ -144,8 +144,10 @@ public class OwnManagementInfController extends BaseController
             LambdaQueryWrapper<FileInf> file = new LambdaQueryWrapper();
             file.eq(FileInf::getPfiFileId,managementFile.get(i).getSmfrFileId());
             List<FileInf> fileInf = pubFileInfService.findFileInfs(file);
-            pfi.put("file",fileInf.get(0).getPfiFileId());
-            pfi.put("pfiUrl",fileInf.get(0).getPfiUrl());
+            if(fileInf.size()>0){
+                pfi.put("file",fileInf.get(0).getPfiFileId());
+                pfi.put("pfiUrl",fileInf.get(0).getPfiUrl());
+            }
             dailyResult.add(pfi);
         }
         map1.put("data",dailyResult);
@@ -419,7 +421,7 @@ public class OwnManagementInfController extends BaseController
         for(int i=0;i < smiAgreement.size();i++){
             SysManagementFileRel file =new SysManagementFileRel();
             file.setSmfrCompanyId(scyId);
-            file.setSmfrFileId(smiAgreement.get(i).get("uid"));
+            file.setSmfrFileId(String.valueOf(smiAgreement.get(i).get("uid")));
             sysManagementFileRelService.createSysManagementFileRel(file);
         }
         return R.ok();

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysUserServiceImpl.java

@@ -285,16 +285,14 @@ public class SysUserServiceImpl implements ISysUserService
         map.put("userId",userId);
         map.put("companyId",user.getCompanyId());
         List<Map> list = userRoleMapper.selectDeleteQuery(map);
-        if(list.size() > 0){
-            for (Map m :list){
-                String id = CommonUtil.objToString(m.get("userId"));
-                String roId = CommonUtil.objToString(m.get("roleId"));
-                Map<String, Object> param = new HashMap<>();
-                param.put("userId", id);
-                param.put("roleId", roId);
-                // 删除用户与角色关联
-                userRoleMapper.deleteUserRoleByUserId(param);
-            }
+        for (Map m :list){
+            String id = CommonUtil.objToString(m.get("userId"));
+            String roId = CommonUtil.objToString(m.get("roleId"));
+            Map<String, Object> param = new HashMap<>();
+            param.put("userId", id);
+            param.put("roleId", roId);
+            // 删除用户与角色关联
+            userRoleMapper.deleteUserRoleByUserId(param);
         }
         // 新增用户与角色管理
         insertUserRole(user);