处理菜单排序和默认头像

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

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

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