Browse Source

ryId不同,ryNo相同bug

lyhzzz 1 year ago
parent
commit
c2a68e55c1

+ 7 - 7
src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -183,15 +183,15 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         JyUser jyUser = jyUserService.getByRyId(param.getRyId());
         JyUser jyUser = jyUserService.getByRyId(param.getRyId());
 
 
         JyUser jyUser2 = jyUserService.getByRyNo(param.getRyNo());
         JyUser jyUser2 = jyUserService.getByRyNo(param.getRyNo());
+
+        if(jyUser == null && jyUser2!=null){
+            throw new BusinessException(ResultCode.RYNO_EXITS);
+        }
+        if(jyUser != null && !jyUser2.getId().equals(jyUser.getId())){
+            throw new BusinessException(ResultCode.RYNO_EXITS);
+        }
         if(jyUser == null){
         if(jyUser == null){
             jyUser = new JyUser();
             jyUser = new JyUser();
-            if(jyUser2 !=null){
-                throw new BusinessException(ResultCode.RYNO_EXITS);
-            }
-        }else {
-            if(jyUser2 !=null && !jyUser2.getRyNo().equals(param.getRyNo())){
-                throw new BusinessException(ResultCode.RYNO_EXITS);
-            }
         }
         }
 
 
         User user = this.addUser(jyUser.getUserId(),passwordMd5, param.getRyNo(), param.getNickName());
         User user = this.addUser(jyUser.getUserId(),passwordMd5, param.getRyNo(), param.getNickName());

+ 1 - 1
src/main/java/com/fdkankan/manage/util/AesUtil.java

@@ -122,7 +122,7 @@ public class AesUtil {
      * 测试
      * 测试
      */
      */
     public static void main(String args[]) throws Exception {
     public static void main(String args[]) throws Exception {
-        String data = "123456";
+        String data = "Aa123456";
         //String key = getRandomStringKey();  //0000001210830863
         //String key = getRandomStringKey();  //0000001210830863
         //String iv = getRandomStringIv();    //1xo1ub7m2rsz92ev
         //String iv = getRandomStringIv();    //1xo1ub7m2rsz92ev