bug

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -84,12 +84,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
     public CyPersistModel persist(SysUser sysUser) {
 
         // 判断是否未访客
-        if (sysUser.getUserType().equals("1")){
+        if (sysUser.getUserType().equals("1")) {
             List<SysUser> userList = sysUserRepositorys.querySysUsersByPhone(sysUser.getPhone());
-            if (userList.size() == 0){
+            if (userList.size() == 0) {
                 sysUserRepositorys.addSysUsers(sysUser);
-            }else {
-                for (SysUser u: userList) {
+            } else {
+                for (SysUser u : userList) {
                     u.setName(sysUser.getName());
                     sysUserRepositorys.updateSysUser(u);
                 }
@@ -97,10 +97,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
             return new CyPersistModel(1);
         }
 
-        //查询是否重名
-        if (sysUserRepositorys.querySysUsersByName(sysUser.getName()).size() >= 1) {
-            throw new CyServiceException(500, "姓名已存在");
-        }
+//        //查询是否重名
+//        if (sysUserRepositorys.querySysUsersByName(sysUser.getName()).size() >= 1) {
+//            throw new CyServiceException(500, "姓名已存在");
+//        }
         //判断是否添加为管理员
         if (sysUser.getIdentity().equals("2")) {
             //查询是否有重复用户名
@@ -175,7 +175,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
     public CyPersistModel merge(SysUser sysUser) {
-        sysUser.getRoleList();
+        //查询是否有重复用户名
+        if (sysUserRepositorys.querySysUsersByUserName(sysUser.getUsername()).size() >= 1) {
+            throw new CyServiceException(500, "用户名已存在");
+        }
         int line = sysUserRepositorys.updateSysUser(sysUser);
         //更新角色
         sysUserRoleRepository.delRoles(sysUser.getBusinessId());

src/main/resources/mapper/SysUserRepositorys.xml

@@ -48,12 +48,10 @@
     </select>
 
     <select id="querySysUsersPaged" resultMap="BaseResultMap">
-        select sdd.dict_sort,su.*
-        from sys_user su
-        JOIN sys_dict_data sdd
-        ON su.position = sdd.dict_value
+        select *
+        from sys_user
         where
-        su.del_flag = 0
+        del_flag = 0
         <if test="entity.userType !=null and entity.userType != '' ">
             and user_type = #{entity.userType}
         </if>
@@ -88,7 +86,7 @@
             ORDER BY create_date desc
         </if>
         <if test="entity.px == '2'.toString() "><!-- 排序-->
-            ORDER BY dict_sort desc
+            ORDER BY position
         </if>
         <if test="entity.px == '3'.toString() "><!-- 排序-->
             ORDER BY name