企业认证提示修改

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

@@ -597,7 +597,7 @@ public class OwnAuthController extends BaseController {
                 // 新增角色
                 handlerUser.setCompanyId(scyId);
                 handlerUser.setRoleIds(roleIds);
-                userService.updateUser(handlerUser);
+                userService.updateUse(handlerUser);
 
                 //创建经办人与企业关系
                 SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
@@ -792,18 +792,18 @@ public class OwnAuthController extends BaseController {
         String scyId = CommonUtil.objToString(map.get("scyId"));
         //开户名
         String pbaiAccountName = CommonUtil.objToString(map.get("scyName"));
-        //银行卡号
+        //开户银行
+        String pbaiBankName = CommonUtil.objToString(map.get("pbaiBankName"));
+        if(CommonUtil.isEmpty(pbaiBankName)){
+            throw new Exception("开户银行不能为空!");
+        }
+        //银行帐号
         String pbaiBankaccountId = CommonUtil.objToString(map.get("pbaiBankaccountId"));
         if(CommonUtil.isEmpty(pbaiBankaccountId)){
-            throw new Exception("银行卡号不能为空!");
+            throw new Exception("银行帐号不能为空!");
         }
         if(!RegularUtil.isPositive(pbaiBankaccountId)){
-            throw new Exception("请输入正确的银行卡号!");
-        }
-        //所属银行
-        String pbaiBankName = CommonUtil.objToString(map.get("pbaiBankName"));
-        if(CommonUtil.isEmpty(pbaiBankName)){
-            throw new Exception("所属银行不能为空!");
+            throw new Exception("请输入正确的银行帐号!");
         }
         //备注
         String zbiRemark = CommonUtil.objToString(map.get("zbiRemark"));

tianhu-system/src/main/java/com/tianhu/system/service/ISysUserService.java

@@ -137,6 +137,14 @@ public interface ISysUserService
      * @param user 用户信息
      * @return 结果
      */
+    public int updateUse(SysUser user);
+
+    /**
+     * 修改用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
     public int updateUser(OwnSysUser user);
 
     /**

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

@@ -312,6 +312,34 @@ public class SysUserServiceImpl implements ISysUserService
         iSysUserCompanyRelService.update(userCompanyRel, lambdaQueryWrapper);
         return userMapper.updateUser(user);
     }
+    /**
+     * 修改保存用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateUse(SysUser user)
+    {
+        Long userId = user.getUserId();
+        Map map = new HashMap();
+        map.put("userId",userId);
+        map.put("companyId",user.getCompanyId());
+        List<Map> list = userRoleMapper.selectDeleteQuery(map);
+        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);
+        return userMapper.updateUser(user);
+    }
 
     /**
      * 修改保存用户信息