Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-common/src/main/java/cn.com.ty.lift.common/constants/ApiConstants.java

@@ -55,4 +55,24 @@ public class ApiConstants {
      */
     public static final String AREA_PARENT_ATTR = "parent";
 
+    /**
+     * 用户常量
+     */
+    public interface UserConstants {
+        /**
+         * 超级管理员/平台管理员
+         */
+        int TYPE_SUPER_ADMIN = 0;
+
+        /**
+         *企业管理员
+         */
+        int TYPE_ENTERPRISE_ADMIN = 1;
+
+        /**
+         * 普通用户
+         */
+        int TYPE_USER = 2;
+    }
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IMenuService.java

@@ -52,4 +52,13 @@ public interface IMenuService extends IService<Menu> {
      * @return
      */
     RestResponse companyMenu(MenuRequest menuRequest);
+
+    /**
+     * @description 获取菜单树
+     * @date 2019-12-09
+     * @param menuList 菜单列表
+     * @return
+     */
+    List<Menu> getMenuTree(List<Menu> menuList);
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MenuService.java

@@ -50,13 +50,14 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
 
     @Override
     public RestResponse all() {
-        return RestResponse.ok(this.list(), ApiConstants.RESULT_SUCCESS, "获取所有菜单信息");
+        List<Menu> allMenus = this.list();
+        return RestResponse.ok(getMenuTree(allMenus), ApiConstants.RESULT_SUCCESS, "获取所有菜单信息");
     }
 
     @Override
     public RestResponse list(MenuRequest menuRequest) {
         List<Menu> menuList = this.list(new QueryWrapper<Menu>().eq("company_id", menuRequest.getCompanyId()));
-        return RestResponse.ok(menuList, ApiConstants.RESULT_SUCCESS, "获取企业所有菜单信息");
+        return RestResponse.ok(getMenuTree(menuList), ApiConstants.RESULT_SUCCESS, "获取企业所有菜单信息");
     }
 
     @Override
@@ -80,6 +81,11 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
         return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "分配菜单成功");
     }
 
+    @Override
+    public List<Menu> getMenuTree(List<Menu> menuList) {
+        return TreeUtil.listToTree(menuList, ApiConstants.MENU_PARENT_ATTR, ApiConstants.ROOT_MENU_PARENT_ID, "id");
+    }
+
     /**
      * @param menuTree 菜单树，
      * @param sb       路径StringBuilder对象

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -41,6 +41,8 @@ public class UserService implements IUserService {
         //设置账号(小梯号)
         userAccount.setAccount(userRequest.getAccount());
         userAccount.setCreateDate(new Date());
+        //设置用户类型
+        userAccount.setType(ApiConstants.UserConstants.TYPE_USER);
         UserInfo userInfo = new UserInfo();
         userInfo.setName(userRequest.getName());