2023-2-13 修改学生校验卡号的唯一性

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysStudentController.java

@@ -244,8 +244,9 @@ public class SysStudentController extends BaseController {
         if(StringUtils.isNotEmpty(user.getCardNum())){
 //            Long carNum10 = Long.parseLong(user.getCardNum());
 //            String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
-            String num = DESUtils.decrypt(user.getCardNumSimple());
-            SysUser sysUser= userService.selectUserInfoByCardNum(num);
+            String num = DESUtils.encrypt(user.getCardNum());
+
+            SysUser sysUser= userService.selectUserInfoByCardNum(user.getUserId(),num);
             if(null!=sysUser && user.getUserId().intValue()!=sysUser.getUserId().intValue()){
                 return AjaxResult.error(user.getCardNum()+"已与"+sysUser.getNickName()+"绑定,无法提交");
             }

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysUserMapper.java

@@ -81,10 +81,10 @@ public interface SysUserMapper {
     /**
      * 通过用户卡号查询用户id,用户姓名
      *
-     * @param cardNum 卡号
+     * @param checkUser 卡号，用户id
      * @return 用户对象信息
      */
-    public SysUser selectUserInfoByCardNum(String cardNum);
+    public SysUser selectUserInfoByCardNum(SysUser checkUser);
 
     /**
      * 通过用户ID查询用户

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysUserService.java

@@ -76,7 +76,7 @@ public interface ISysUserService {
      * @param cardNum 用户名
      * @return 用户对象信息
      */
-    public SysUser selectUserInfoByCardNum(String cardNum);
+    public SysUser selectUserInfoByCardNum(Long userId,String cardNum);
 
     /**
      * 通过用户ID查询用户

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysUserServiceImpl.java

@@ -154,8 +154,11 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserInfoByCardNum(String cardNum) {
-        return userMapper.selectUserInfoByCardNum(cardNum);
+    public SysUser selectUserInfoByCardNum(Long userId,String cardNum) {
+        SysUser checkUser = new SysUser();
+        checkUser.setCardNumSimple(cardNum);
+        checkUser.setUserId(userId);
+        return userMapper.selectUserInfoByCardNum(checkUser);
     }
     /**
      * 通过用户ID查询用户

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -805,7 +805,7 @@
     </select>
 
     <select id="selectUserInfoByCardNum" resultType="com.zd.model.entity.SysUser">
-        SELECT user_id,nick_name,card_num,card_num_simple FROM sys_user u WHERE u.card_num_simple = #{cardNumSimple}
+        SELECT user_id,nick_name,card_num,card_num_simple FROM sys_user u WHERE u.card_num_simple = #{cardNumSimple} and u.user_id != #{userId}
     </select>
 
     <select id="getSafeUserList" parameterType="com.zd.model.entity.SysUser" resultMap="SysUserResult">