diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java index effae3ec..6f0bef7e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -235,7 +235,9 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { String salt = ToolsUtil.randomString(5); String pwd = ToolsUtil.makeMd5(systemAuthAdminParam.getPassword().trim() + salt); - String avatar = UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar()); + String avatar = StringUtil.isNotEmpty(systemAuthAdminParam.getAvatar()) ? + UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar()) : + "/api/static/backend_avatar.jpg"; SystemAuthAdmin model = new SystemAuthAdmin(); model.setDeptId(systemAuthAdminParam.getDeptId()); @@ -328,8 +330,12 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { Assert.notNull(model, "账号不存在了!"); + String avatar = StringUtil.isNotEmpty(systemAuthAdminParam.getAvatar()) ? + UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar()) : + "/api/static/backend_avatar.jpg"; + + model.setAvatar(avatar); model.setNickname(systemAuthAdminParam.getNickname()); - model.setAvatar( UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar())); model.setUpdateTime(System.currentTimeMillis() / 1000); if (systemAuthAdminParam.getPassword() != null && !systemAuthAdminParam.getPassword().equals("")) { diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java index 019a0336..3d5c6dd4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java @@ -49,7 +49,8 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("menu_type", Arrays.asList("M", "C")); queryWrapper.eq("is_disable", 0); - queryWrapper.orderByAsc(Arrays.asList("menu_sort", "id")); + queryWrapper.orderByDesc("menu_sort"); + queryWrapper.orderByAsc("id"); if (adminId != 1 && menuIds.size() > 0) { queryWrapper.in("id", menuIds); } @@ -79,7 +80,8 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { @Override public JSONArray list() { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.orderByAsc(Arrays.asList("menu_sort", "id")); + queryWrapper.orderByDesc("menu_sort"); + queryWrapper.orderByAsc("id"); List systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper); diff --git a/server/like-admin/src/main/resources/static/backend_avatar.jpg b/server/like-admin/src/main/resources/static/backend_avatar.jpg new file mode 100644 index 00000000..f4073c9e Binary files /dev/null and b/server/like-admin/src/main/resources/static/backend_avatar.jpg differ diff --git a/server/like-admin/src/main/resources/static/backend_avatar.png b/server/like-admin/src/main/resources/static/backend_avatar.png deleted file mode 100644 index 20517192..00000000 Binary files a/server/like-admin/src/main/resources/static/backend_avatar.png and /dev/null differ diff --git a/sql/install.sql b/sql/install.sql index 02eb2cd0..dff381de 100644 --- a/sql/install.sql +++ b/sql/install.sql @@ -416,7 +416,7 @@ COMMIT; BEGIN; INSERT INTO `la_system_auth_dept` VALUES (1, 0, '默认部门', '康明', '18327647788', 10, 0, 0, 1649841995, 1660190949, 0); -INSERT INTO `la_system_auth_admin` VALUES (1, 1, 0, 'admin', 'admin', '7fac2474740becfaf1ecbdd6cc8fb076', '/api/static/backend_avatar.png', '0', '5Xar0', 0, 1, 0, 0, '127.0.0.1', 1660641347, 1642321599, 1660287325, 0); +INSERT INTO `la_system_auth_admin` VALUES (1, 1, 0, 'admin', 'admin', '7fac2474740becfaf1ecbdd6cc8fb076', '/api/static/backend_avatar.jpg', '0', '5Xar0', 0, 1, 0, 0, '127.0.0.1', 1660641347, 1642321599, 1660287325, 0); COMMIT; BEGIN;