Преглед изворни кода

pms 瑞都 日报 移动端 日报功能入口 显示或隐藏标识

zhangcl пре 16 часа
родитељ
комит
3acd26942f

+ 13 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.user;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
@@ -29,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -65,11 +67,21 @@ public class UserProfileController {
         List<RoleDO> userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(user.getId()));
         // 获得部门信息
         DeptDO dept = user.getDeptId() != null ? deptService.getDept(user.getDeptId()) : null;
+        boolean rdReportFlag = false;
+        // 获取当前登录人的公司级部门 如果 是 四川瑞都163 则设置 标识 rdReportFlag = true
+        // 查询瑞都下所有部门
+        Set<Long> childDeptIds = deptService.getChildDeptIdListFromCache(163l);
+        childDeptIds.add(163l);
+        if (ObjUtil.isNotEmpty(dept)) {
+            if (childDeptIds.contains(dept.getId())) {
+                rdReportFlag = true;
+            }
+        }
         // 获得岗位信息
         List<PostDO> posts = CollUtil.isNotEmpty(user.getPostIds()) ? postService.getPostList(user.getPostIds()) : null;
         // 获得社交用户信息
         List<SocialUserDO> socialUsers = socialService.getSocialUserList(user.getId(), UserTypeEnum.ADMIN.getValue());
-        return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts, socialUsers));
+        return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts, socialUsers, rdReportFlag));
     }
 
     @PutMapping("/update")

+ 3 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java

@@ -60,6 +60,9 @@ public class UserProfileRespVO {
      */
     private List<SocialUser> socialUsers;
 
+    @Schema(description = "瑞都日报 功能模块标识", example = "true false")
+    private boolean rdReportFlag;
+
     @Schema(description = "社交用户")
     @Data
     public static class SocialUser {

+ 2 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java

@@ -46,12 +46,13 @@ public interface UserConvert {
     }
 
     default UserProfileRespVO convert(AdminUserDO user, List<RoleDO> userRoles,
-                                      DeptDO dept, List<PostDO> posts, List<SocialUserDO> socialUsers) {
+                                      DeptDO dept, List<PostDO> posts, List<SocialUserDO> socialUsers, boolean rdReportFlag) {
         UserProfileRespVO userVO = BeanUtils.toBean(user, UserProfileRespVO.class);
         userVO.setRoles(BeanUtils.toBean(userRoles, RoleSimpleRespVO.class));
         userVO.setDept(BeanUtils.toBean(dept, DeptSimpleRespVO.class));
         userVO.setPosts(BeanUtils.toBean(posts, PostSimpleRespVO.class));
         userVO.setSocialUsers(BeanUtils.toBean(socialUsers, UserProfileRespVO.SocialUser.class));
+        userVO.setRdReportFlag(rdReportFlag);
         return userVO;
     }