菜单管理

src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -65,30 +65,35 @@ public class BmsSysUserService{
                                 .eq(CareSysUser::getPhone,phone);
         CareSysUser user = this.careSysUserService.getOne(userQueryWrapper);
         if (user != null){
-            CareOrganization org =  careOrganizationService.getById(user.getOrgId());
+            userLogindConvertVO = new UserLogindConvertVO();
+            BeanUtil.copyProperties(user,userLogindConvertVO);
+            Date now = DateUtils.strToDate(DateUtils.getCurrYyyy_MM_ddDate(),"yyyy-MM-dd");
 
-            if (ValidStatusEnum.INVALID.getValue().equals(org.getValidStatus())) {
-                throw new BDException("该用户所属机构已经停用");
-            }
+            if(user.getOrgId() != null) {
+                CareOrganization org =  careOrganizationService.getById(user.getOrgId());
 
-            Date servStartDate0 = org.getServStartDate();
-            Date servEndDate0 = org.getServEndDate();
-            Date now = DateUtils.strToDate(DateUtils.getCurrYyyy_MM_ddDate(),"yyyy-MM-dd");
-            if(servEndDate0 != null || servEndDate0 != null) {
-                if ( now.before(servStartDate0) || now.after(servEndDate0)) {
-                    throw new BDException("该用户所属机构没在有效期");
+                if (ValidStatusEnum.INVALID.getValue().equals(org.getValidStatus())) {
+                    throw new BDException("该用户所属机构已经停用");
                 }
-            }
 
-            if (ValidStatusEnum.INVALID.getValue().equals(org.getValidStatus())) {
-                throw new BDException("该用户所属机构已经停用");
+                Date servStartDate0 = org.getServStartDate();
+                Date servEndDate0 = org.getServEndDate();
+
+                if(servEndDate0 != null || servEndDate0 != null) {
+                    if ( now.before(servStartDate0) || now.after(servEndDate0)) {
+                        throw new BDException("该用户所属机构没在有效期");
+                    }
+                }
+
+                if (ValidStatusEnum.INVALID.getValue().equals(org.getValidStatus())) {
+                    throw new BDException("该用户所属机构已经停用");
+                }
+                userLogindConvertVO.setOrgName(org.getName());
+                userLogindConvertVO.setSystemName(org.getSystemName());
+                userLogindConvertVO.setLogo(org.getLogo());
             }
 
-            userLogindConvertVO = new UserLogindConvertVO();
-            BeanUtil.copyProperties(user,userLogindConvertVO);
-            userLogindConvertVO.setOrgName(org.getName());
-            userLogindConvertVO.setSystemName(org.getSystemName());
-            userLogindConvertVO.setLogo(org.getLogo());
+
             String md5Password = DigestUtils.md5Hex(password);
             if (!md5Password.equalsIgnoreCase(user.getPassword())) {
                 throw new BDException("用户名或密码错误");

src/main/java/com/care/bms/service/MenuService.java

@@ -46,7 +46,7 @@ public class MenuService {
     private void removeNotUserMenu(Long userId, List<MenuVO> topMenus) {
         for (int i = 0; i < topMenus.size(); i++) {
             MenuVO vo = topMenus.get(i);
-            if (!userId.equals(vo.getUserId())) {
+            if (userId != vo.getUserId()) {
                 topMenus.remove(i);
                 i--;
                 continue;

src/main/java/com/care/common/vo/MenuVO.java

@@ -52,7 +52,7 @@ public class MenuVO implements Serializable {
 
 
     @ApiModelProperty(dataType = "String", name = "userId", value = "用户ID")
-    private String userId;
+    private Long userId;
 
     @ApiModelProperty(dataType = "String",name = "children",value = "子菜单集合")
     private List<MenuVO> children = new ArrayList<>();

src/main/resources/mybatis/CareMenuMapper.xml

@@ -10,6 +10,7 @@
         <result property="level" column="level" />
         <result property="pid" column="pid" />
         <result property="userId" column="userId" />
+        <result property="sort" column="sort" />
         <collection property="children"
                     ofType="com.care.common.vo.MenuVO"
                     select="findChildMenus"
@@ -17,7 +18,7 @@
     </resultMap>
 
     <select id="findChildMenus" resultMap="menuList">
-        SELECT  m.id,m.name,m.code,m.url,m.level,m.pid,u.id userId
+        SELECT  m.id,m.name,m.code,m.url,m.level,m.pid,u.id userId,m.sort
         FROM care_menu m
         left join care_role_menu_rel rm on rm.menu_id=m.id
         left join care_role r on r.id=rm.role_id
@@ -27,7 +28,8 @@
     </select>
 
     <select id="getTopMenus" resultType="com.care.common.vo.MenuVO">
-        SELECT  m.id,m.name,m.code,m.url,m.level,m.pid,u.id userId from care_menu m
+        SELECT  m.id,m.name,m.code,m.url,m.level,m.pid,u.id userId,m.sort
+        from care_menu m
         left join  care_role_menu_rel rm on rm.menu_id=m.id
         left join care_role r on r.id=rm.role_id
         left join care_sys_user u on u.role=r.code