Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -2501,6 +2501,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         userVO.setHasAuditDept(num>0);
         //获取当前角色的权限菜单
         setUserRoleMenu(userVO);
+
+        if(company.getId()==Constant.MLD_COMPANY_ID) {
+            //检测项目角色
+            userVO.setProjectLeaderType(judgeIsProjectLeader(userVO.getId(),company.getId()));
+        }
         httpRespMsg.data = userVO;
         return httpRespMsg;
     }