Merge branch 'master' of http://git.minpay.cc/SupplyChain/system

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

@@ -553,7 +553,10 @@ public class OwnAuthController extends BaseController {
                 if(jsfzfList.size() > 0){
                     sysUserCompanyRel.setSucrCardBackFile(jsfzfList.get(0).get("uid"));
                 }
-                sysUserCompanyRelService.updateSysUserCompanyRel(sysUserCompanyRel);
+                LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
+                lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
+                sysUserCompanyRelService.update(sysUserCompanyRel,lambdaQueryWrapper);
             }else{
                 // 增加关系表数据
                 SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
@@ -627,7 +630,7 @@ public class OwnAuthController extends BaseController {
                 handlerUser.setRoleIds(roleIds);
                 userService.updateUse(handlerUser);
 
-                //创建经办人与企业关系
+                // 增加关系表数据
                 SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
                 sysUserCompanyRel.setSucrCompanyId(scyId);
                 sysUserCompanyRel.setSucrUserId(handlerUser.getUserId());
@@ -642,15 +645,55 @@ public class OwnAuthController extends BaseController {
                 if(jsfzfList.size() > 0){
                     sysUserCompanyRel.setSucrCardBackFile(jsfzfList.get(0).get("uid"));
                 }
-                sysUserCompanyRelService.saveOrUpdate(sysUserCompanyRel);
+                LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
+                lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
+                sysUserCompanyRelService.update(sysUserCompanyRel,lambdaQueryWrapper);
+
             }
             //创建登陆用户与企业关系
-            SysUserCompanyRel userCompany = new SysUserCompanyRel();
-            userCompany.setSucrCompanyId(scyId);
-            userCompany.setSucrUserId(use.getUserId());
-            userCompany.setSucrDeptId(deptId);
-            userCompany.setSucrHandler("0");
-            sysUserCompanyRelService.saveOrUpdate(userCompany);
+            LambdaQueryWrapper<SysUserCompanyRel> sysuserCompany =new LambdaQueryWrapper();
+            sysuserCompany.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
+            sysuserCompany.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
+            List<SysUserCompanyRel>  userCompanyRels = sysUserCompanyRelService.findSysUserCompanyRels(sysuserCompany);
+            if(userCompanyRels.size()>0){
+                // 增加关系表数据
+                SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
+                sysUserCompanyRel.setSucrCompanyId(scyId);
+                sysUserCompanyRel.setSucrUserId(use.getUserId());
+                sysUserCompanyRel.setSucrDeptId(deptId);
+                sysUserCompanyRel.setSucrHandler("1");
+                if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
+                    sysUserCompanyRel.setSucrCard(handlerCard);
+                }else{
+                    sysUserCompanyRel.setSucrCard(scyLegalId);
+                }
+                sysUserCompanyRel.setSucrCardFile(fsfzzList);
+                if(jsfzfList.size() > 0){
+                    sysUserCompanyRel.setSucrCardBackFile(jsfzfList.get(0).get("uid"));
+                }
+                LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
+                lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
+                sysUserCompanyRelService.update(sysUserCompanyRel,lambdaQueryWrapper);
+            }else{
+                // 增加关系表数据
+                SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
+                sysUserCompanyRel.setSucrCompanyId(scyId);
+                sysUserCompanyRel.setSucrUserId(use.getUserId());
+                sysUserCompanyRel.setSucrDeptId(deptId);
+                sysUserCompanyRel.setSucrHandler("1");
+                if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
+                    sysUserCompanyRel.setSucrCard(handlerCard);
+                }else{
+                    sysUserCompanyRel.setSucrCard(scyLegalId);
+                }
+                sysUserCompanyRel.setSucrCardFile(fsfzzList);
+                if(jsfzfList.size() > 0){
+                    sysUserCompanyRel.setSucrCardBackFile(jsfzfList.get(0).get("uid"));
+                }
+                sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
+            }
         }
 
         //创建其他和管理员

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

@@ -94,7 +94,7 @@ public class SysProfileController extends BaseController
         {
             return AjaxResult.error("修改密码失败，旧密码错误");
         }
-        String chackPassword = "^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{6,20}$";
+        String chackPassword = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$";
         Pattern regePassword = Pattern.compile(chackPassword);
         Matcher matcherPassword = regePassword.matcher(newPassword);
         boolean isMatPassword = matcherPassword.matches();

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

@@ -804,7 +804,7 @@ public class SysUserController extends BaseController
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user)
     {
-        String checkPassword = "^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{6,20}$";
+        String checkPassword = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$";
         Pattern regePassword = Pattern.compile(checkPassword);
         Matcher matcherPassword = regePassword.matcher(user.getPassword());
         boolean isMatPassword = matcherPassword.matches();

tianhu-system/src/main/resources/mapper/system/OwnSysUserMapper.xml

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		u.create_by createBy,
 		DATE_FORMAT(u.create_time,'%Y-%m-%d %T')	createTime,
 		u.remark remark,
+		ucr.sucr_handler,
 		c.scy_type scyType,
 		c.scy_id scyId,
 		c.scy_name scyName,