pms 移动端 瑞都 非生产时效 按钮 权限

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

@@ -88,6 +88,8 @@ public class UserProfileController {
         boolean ryXjReportFlag = false;
         // 瑞鹰修井日报 菜单标识 移动端使用
         boolean ryXjReportApprovalFlag = false;
+        // 瑞都日报 修改非生产时效标识 移动端使用
+        boolean rdNonProductFlag = false;
         // 获取当前登录人的公司级部门 如果 是 四川瑞都163 则设置 标识 rdReportFlag = true
         // 查询瑞都下所有部门
         Set<Long> childDeptIds = deptService.getChildDeptIdListFromCache(163l);
@@ -105,6 +107,10 @@ public class UserProfileController {
             if (childDeptIds.contains(dept.getId())) {
                 rdReportFlag = true;
             }
+            // 瑞都日报 非生产时效 填报
+            if (childDeptIds.contains(dept.getId()) && roleCodes.contains("非生产时效RD")) {
+                rdNonProductFlag = true;
+            }
             // 瑞恒日报标识
             if (rhChildDeptIds.contains(dept.getId()) && roleCodes.contains("日报填报RH")) {
                 rhReportFlag = true;
@@ -133,7 +139,7 @@ public class UserProfileController {
         // 获得社交用户信息
         List<SocialUserDO> socialUsers = socialService.getSocialUserList(user.getId(), UserTypeEnum.ADMIN.getValue());
         return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts, socialUsers,
-                rdReportFlag, rhReportFlag, rhReportApprovalFlag, ryReportFlag, ryReportApprovalFlag, ryXjReportFlag, ryXjReportApprovalFlag));
+                rdReportFlag, rdNonProductFlag, rhReportFlag, rhReportApprovalFlag, ryReportFlag, ryReportApprovalFlag, ryXjReportFlag, ryXjReportApprovalFlag));
     }
 
     @PutMapping("/update")

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

@@ -62,6 +62,8 @@ public class UserProfileRespVO {
 
     @Schema(description = "瑞都日报 功能模块标识", example = "true false")
     private boolean rdReportFlag;
+    @Schema(description = "瑞都日报 非生产时效标识", example = "true false")
+    private boolean rdNonProductFlag;
 
     @Schema(description = "瑞恒日报 功能模块标识", example = "true false")
     private boolean rhReportFlag;

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

@@ -47,7 +47,7 @@ public interface UserConvert {
 
     default UserProfileRespVO convert(AdminUserDO user, List<RoleDO> userRoles,
                                       DeptDO dept, List<PostDO> posts, List<SocialUserDO> socialUsers,
-                                      boolean rdReportFlag, boolean rhReportFlag, boolean rhReportApprovalFlag, boolean ryReportFlag,
+                                      boolean rdReportFlag, boolean rdNonProductFlag, boolean rhReportFlag, boolean rhReportApprovalFlag, boolean ryReportFlag,
                                       boolean ryReportApprovalFlag, boolean ryXjReportFlag, boolean ryXjReportApprovalFlag) {
         UserProfileRespVO userVO = BeanUtils.toBean(user, UserProfileRespVO.class);
         userVO.setRoles(BeanUtils.toBean(userRoles, RoleSimpleRespVO.class));
@@ -55,6 +55,7 @@ public interface UserConvert {
         userVO.setPosts(BeanUtils.toBean(posts, PostSimpleRespVO.class));
         userVO.setSocialUsers(BeanUtils.toBean(socialUsers, UserProfileRespVO.SocialUser.class));
         userVO.setRdReportFlag(rdReportFlag);
+        userVO.setRdNonProductFlag(rdNonProductFlag);
         userVO.setRhReportFlag(rhReportFlag);
         userVO.setRhReportApprovalFlag(rhReportApprovalFlag);
         userVO.setRyReportFlag(ryReportFlag);