ソースを参照

遗漏的优化代码

RuoYi 2 年 前
コミット
590f6a302c

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -83,7 +83,7 @@ public class SysConfigController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysConfig config)
     {
-        if (configService.checkConfigKeyUnique(config))
+        if (!configService.checkConfigKeyUnique(config))
         {
             return error("新增参数'" + config.getConfigName() + "'失败,参数键名已存在");
         }
@@ -111,7 +111,7 @@ public class SysConfigController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated SysConfig config)
     {
-        if (configService.checkConfigKeyUnique(config))
+        if (!configService.checkConfigKeyUnique(config))
         {
             return error("修改参数'" + config.getConfigName() + "'失败,参数键名已存在");
         }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -74,7 +74,7 @@ public class SysDeptController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysDept dept)
     {
-        if (deptService.checkDeptNameUnique(dept))
+        if (!deptService.checkDeptNameUnique(dept))
         {
             return error("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在");
         }
@@ -110,7 +110,7 @@ public class SysDeptController extends BaseController
     {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
-        if (deptService.checkDeptNameUnique(dept))
+        if (!deptService.checkDeptNameUnique(dept))
         {
             return error("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在");
         }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -82,7 +82,7 @@ public class SysDictTypeController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysDictType dict)
     {
-        if (dictTypeService.checkDictTypeUnique(dict))
+        if (!dictTypeService.checkDictTypeUnique(dict))
         {
             return error("新增字典'" + dict.getDictName() + "'失败,字典类型已存在");
         }
@@ -110,7 +110,7 @@ public class SysDictTypeController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated SysDictType dict)
     {
-        if (dictTypeService.checkDictTypeUnique(dict))
+        if (!dictTypeService.checkDictTypeUnique(dict))
         {
             return error("修改字典'" + dict.getDictName() + "'失败,字典类型已存在");
         }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -104,7 +104,7 @@ public class SysMenuController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysMenu menu)
     {
-        if (menuService.checkMenuNameUnique(menu))
+        if (!menuService.checkMenuNameUnique(menu))
         {
             return error("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
         }
@@ -133,7 +133,7 @@ public class SysMenuController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated SysMenu menu)
     {
-        if (menuService.checkMenuNameUnique(menu))
+        if (!menuService.checkMenuNameUnique(menu))
         {
             return error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
         }

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -96,11 +96,11 @@ public class SysPostController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysPost post)
     {
-        if (postService.checkPostNameUnique(post))
+        if (!postService.checkPostNameUnique(post))
         {
             return error("新增岗位'" + post.getPostName() + "'失败,岗位名称已存在");
         }
-        else if (postService.checkPostCodeUnique(post))
+        else if (!postService.checkPostCodeUnique(post))
         {
             return error("新增岗位'" + post.getPostName() + "'失败,岗位编码已存在");
         }
@@ -128,11 +128,11 @@ public class SysPostController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated SysPost post)
     {
-        if (postService.checkPostNameUnique(post))
+        if (!postService.checkPostNameUnique(post))
         {
             return error("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在");
         }
-        else if (postService.checkPostCodeUnique(post))
+        else if (!postService.checkPostCodeUnique(post))
         {
             return error("修改岗位'" + post.getPostName() + "'失败,岗位编码已存在");
         }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -133,11 +133,11 @@ public class SysProfileController extends BaseController
         currentUser.setEmail(user.getEmail());
         currentUser.setPhonenumber(user.getPhonenumber());
         currentUser.setSex(user.getSex());
-        if (StringUtils.isNotEmpty(user.getPhonenumber()) && userService.checkPhoneUnique(currentUser))
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
         {
             return error("修改用户'" + currentUser.getLoginName() + "'失败,手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail()) && userService.checkEmailUnique(currentUser))
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
         {
             return error("修改用户'" + currentUser.getLoginName() + "'失败,邮箱账号已存在");
         }

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -92,11 +92,11 @@ public class SysRoleController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysRole role)
     {
-        if (roleService.checkRoleNameUnique(role))
+        if (!roleService.checkRoleNameUnique(role))
         {
             return error("新增角色'" + role.getRoleName() + "'失败,角色名称已存在");
         }
-        else if (roleService.checkRoleKeyUnique(role))
+        else if (!roleService.checkRoleKeyUnique(role))
         {
             return error("新增角色'" + role.getRoleName() + "'失败,角色权限已存在");
         }
@@ -129,11 +129,11 @@ public class SysRoleController extends BaseController
     {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
-        if (roleService.checkRoleNameUnique(role))
+        if (!roleService.checkRoleNameUnique(role))
         {
             return error("修改角色'" + role.getRoleName() + "'失败,角色名称已存在");
         }
-        else if (roleService.checkRoleKeyUnique(role))
+        else if (!roleService.checkRoleKeyUnique(role))
         {
             return error("修改角色'" + role.getRoleName() + "'失败,角色权限已存在");
         }

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -129,15 +129,15 @@ public class SysUserController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysUser user)
     {
-        if (userService.checkLoginNameUnique(user))
+        if (!userService.checkLoginNameUnique(user))
         {
             return error("新增用户'" + user.getLoginName() + "'失败,登录账号已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && userService.checkPhoneUnique(user))
+        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
         {
             return error("新增用户'" + user.getLoginName() + "'失败,手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail()) && userService.checkEmailUnique(user))
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
         {
             return error("新增用户'" + user.getLoginName() + "'失败,邮箱账号已存在");
         }
@@ -173,15 +173,15 @@ public class SysUserController extends BaseController
     {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
-        if (userService.checkLoginNameUnique(user))
+        if (!userService.checkLoginNameUnique(user))
         {
             return error("修改用户'" + user.getLoginName() + "'失败,登录账号已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && userService.checkPhoneUnique(user))
+        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
         {
             return error("修改用户'" + user.getLoginName() + "'失败,手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail()) && userService.checkEmailUnique(user))
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
         {
             return error("修改用户'" + user.getLoginName() + "'失败,邮箱账号已存在");
         }

+ 0 - 3
ruoyi-admin/src/main/resources/templates/system/config/edit.html

@@ -61,9 +61,6 @@
 	                        "configKey": function() {
 	                        	return $.common.trim($("#configKey").val());
 	                        }
-	                    },
-	                    dataFilter: function(data, type) {
-	                        return $.validate.unique(data);
 	                    }
 	                }
 	            },

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -1598,7 +1598,7 @@ public class ExcelUtil<T>
                     HSSFPicture pic = (HSSFPicture) shape;
                     int pictureIndex = pic.getPictureIndex() - 1;
                     HSSFPictureData picData = pictures.get(pictureIndex);
-                    String picIndex = anchor.getRow1() + "_" + String.valueOf(anchor.getCol1());
+                    String picIndex = anchor.getRow1() + "_" + anchor.getCol1();
                     sheetIndexPicMap.put(picIndex, picData);
                 }
             }