mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理菜单排序和默认头像

This commit is contained in:
TinyAnts 2022-08-19 09:46:40 +08:00
parent 6352e12427
commit 2350e786c1
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java
View File

@ -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("")) {

6
server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java
View File

@ -49,7 +49,8 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
QueryWrapper<SystemAuthMenu> 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<SystemAuthMenu> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByAsc(Arrays.asList("menu_sort", "id"));
queryWrapper.orderByDesc("menu_sort");
queryWrapper.orderByAsc("id");
List<SystemAuthMenu> systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper);

BIN
server/like-admin/src/main/resources/static/backend_avatar.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

BIN
server/like-admin/src/main/resources/static/backend_avatar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 154 KiB

2
sql/install.sql
View File

@ -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;