修改编辑用户

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwuser/controller/HwUserController.java

@@ -186,28 +186,54 @@ public class HwUserController {
                 }
             }
 
-            HwUser hwUser2 = new HwUser();
-            hwUser2.setPhone(hwUser.getPhone());
-            List<HwUser> list2 = hwUserMapper.findList(new Page<HwUser>(), hwUser2, new QueryWrapper<>());
-            if (list2.size() > 0) {
-                result.error500("手机号已存在");
+            String regex = "^(1[3-9])\\d{9}$";
+            if (Pattern.matches(regex, hwUser.getPhone())) {
+                HwUser hwUser2 = new HwUser();
+                hwUser2.setPhone(hwUser.getPhone());
+                List<HwUser> list2 = hwUserMapper.findList(new Page<HwUser>(), hwUser2, new QueryWrapper<>());
+                list2=list2.stream().filter(item -> !item.getId().equals(hwUser1.getId())).collect(Collectors.toList());
+                if (list2.size() > 0) {
+                    result.error500("手机号已存在");
+                    return result;
+                }
+            } else {
+                result.error500("手机号无效");
                 return result;
             }
 
-            HwUser hwUser3 = new HwUser();
-            hwUser3.setIdcardNumber(hwUser.getIdcardNumber());
-            List<HwUser> list3 = hwUserMapper.findList(new Page<HwUser>(), hwUser3, new QueryWrapper<>());
-            if (list3.size() > 0) {
-                result.error500("身份证号已存在");
+            String regex1 = "(^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$)";
+            if (Pattern.matches(regex1, hwUser.getIdcardNumber())) {
+                HwUser hwUser3 = new HwUser();
+                hwUser3.setIdcardNumber(hwUser.getIdcardNumber());
+                List<HwUser> list3 = hwUserMapper.findList(new Page<HwUser>(), hwUser3, new QueryWrapper<>());
+                list3=list3.stream().filter(item -> !item.getId().equals(hwUser1.getId())).collect(Collectors.toList());
+                if (list3.size() > 0) {
+                    result.error500("身份证号已存在");
+                    return result;
+                }
+            } else {
+                result.error500("身份证号无效");
                 return result;
             }
-            HwUser hwUser4 = new HwUser();
-            hwUser4.setCardNumber(hwUser.getCardNumber());
-            List<HwUser> list4 = hwUserMapper.findList(new Page<HwUser>(), hwUser4, new QueryWrapper<>());
-            if (list4.size() > 0) {
-                result.error500("银行卡号已存在");
-                return result;
+
+
+            String regex2 = "^[0-9]*$";
+            if (StringUtils.isNotBlank(hwUser.getCardNumber())) {
+                if (Pattern.matches(regex2, hwUser.getCardNumber())) {
+                    HwUser hwUser4 = new HwUser();
+                    hwUser4.setCardNumber(hwUser.getCardNumber());
+                    List<HwUser> list4 = hwUserMapper.findList(new Page<HwUser>(), hwUser4, new QueryWrapper<>());
+                    list4=list4.stream().filter(item -> !item.getId().equals(hwUser1.getId())).collect(Collectors.toList());
+                    if (list4.size() > 0) {
+                        result.error500("银行卡号已存在");
+                        return result;
+                    }
+                } else {
+                    result.error500("银行卡号无效");
+                    return result;
+                }
             }
+
             boolean ok = hwUserService.updateHwUser(hwUser);
             //TODO 返回false说明什么？
             if (ok) {

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwuser/mapper/xml/HwUserMapper.xml

@@ -213,12 +213,12 @@
 	</select>
 
 	<!--查询接单人-->
-	<select id="findHwuser" resultType="org.jeecg.modules.hwuser.entity.HwUser" >
+	<select id="findHwuserByIdcard" resultType="org.jeecg.modules.hwuser.entity.HwUser" >
 		SELECT
 		<include refid="hwUserColumns"/>
 		FROM hw_user a
 		<include refid="hwUserJoins"/>
-		WHERE a.findHwuserByIdcard = #{idcardNumber}
+		WHERE a.idcard_number = #{idcardNumber}
 	</select>
 
 </mapper>