init: init project step4: biz code support 1 (user dept menu)

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDept.java

@@ -3,13 +3,13 @@ package com.qunzhixinxi.hnqz.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -23,168 +23,168 @@ import java.util.List;
  * @since 2018-01-22
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class SysDept extends Model<SysDept> {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 *
-	 */
-	@TableId
-	private Integer deptId;
-	/**
-	 * 部门名称
-	 */
-	@NotBlank(message = "部门名称不能为空")
-	private String name;
-
-	/**
-	 * 排序
-	 */
-	@NotNull(message = "排序值不能为空")
-	private Integer sort;
-
-	/**
-	 * 服务起始时间
-	 */
-	private LocalDate issueDate;
-
-	/**
-	 * 服务截止时间
-	 */
-	private LocalDate expiryDate;
-
-	/**
-	 * 创建时间
-	 */
-	private LocalDateTime createTime;
-
-	/**
-	 * 修改时间
-	 */
-	private LocalDateTime updateTime;
-	/**
-	 *
-	 */
-	private Integer tenantId;
-	/**
-	 * 父级部门id
-	 */
-	private Integer parentId;
-
-	/**
-	 * 是否删除 1：已删除 0：正常
-	 */
-	@TableLogic
-	private String delFlag;
-
-	/**
-	 * 是否启用名称
-	 */
-	@TableField(exist = false)
-	private String delFlagName;
-
-	/**
-	 *
-	 */
-	private String deptCode;
-	/**
-	 * 级别
-	 */
-	private Integer level;
-
-	/**
-	 * 级别名称(企业类型)
-	 */
-	@TableField(exist = false)
-	private String levelName;
-
-	/**
-	 * 药企名称
-	 */
-	private String level1Name;
-	/**
-	 * 药企ID
-	 */
-	private Integer level1Id;
-	/**
-	 * 一级代理商名称
-	 */
-	private String level2Name;
-	/**
-	 * 一级代理商ID
-	 */
-	private Integer level2Id;
-	/**
-	 * 二级代理商名称
-	 */
-	private String level3Name;
-	/**
-	 * 二级代理商ID
-	 */
-	private Integer level3Id;
-
-	private String appId;
-	private String appSecret;
-	private String rsaPublicKey;
-	private String queryUrl;
-	private String subjectName;
-
-	/**
-	 * 税号
-	 */
-	private String taxCode;
-
-	/**
-	 * 结算主体类型：0->人力家，1->税邦云
-	 */
-	private String[] subjectType;
-
-	/**
-	 * 部门专用权限限制（字符串逗号分隔，0.导出）
-	 */
-	private String[] deptPermissions;
-
-	@TableField(exist = false)
-	private List<String> subList;
-
-	/**
-	 * gmv1收益率（万分之）
-	 */
-	private Integer gmv1Rate;
-
-	/**
-	 * gmv2收益率（万分之）
-	 */
-	private Integer gmv2Rate;
-
-	/**
-	 * 人力家服务费费率（万分之）
-	 */
-	private Integer renlijiaServiceChargeRate;
-
-	/**
-	 * 财务复核方式
-	 */
-	private UpmsType.FinancialReviewType financialReviewType;
-
-	/**
-	 * csm负责人
-	 */
-	@TableField(exist = false)
-	private String csmNames;
-
-	/**
-	 * csm负责人用户id
-	 */
-	@TableField(exist = false)
-	private Integer[] csmUserIds;
-
-	/**
-	 * 上级企业名称
-	 */
-	@TableField(exist = false)
-	private String superDeptName;
+@TableName(value = "sys_dept", autoResultMap = true)
+public class SysDept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer deptId;
+    /**
+     * 部门名称
+     */
+    @NotBlank(message = "部门名称不能为空")
+    private String name;
+
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序值不能为空")
+    private Integer sort;
+
+    /**
+     * 服务起始时间
+     */
+    private LocalDate issueDate;
+
+    /**
+     * 服务截止时间
+     */
+    private LocalDate expiryDate;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+    /**
+     *
+     */
+    private Integer tenantId;
+    /**
+     * 父级部门id
+     */
+    private Integer parentId;
+
+    /**
+     * 是否删除 1：已删除 0：正常
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 是否启用名称
+     */
+    @TableField(exist = false)
+    private String delFlagName;
+
+    /**
+     *
+     */
+    private String deptCode;
+    /**
+     * 级别
+     */
+    private Integer level;
+
+    /**
+     * 级别名称(企业类型)
+     */
+    @TableField(exist = false)
+    private String levelName;
+
+    /**
+     * 药企名称
+     */
+    private String level1Name;
+    /**
+     * 药企ID
+     */
+    private Integer level1Id;
+    /**
+     * 一级代理商名称
+     */
+    private String level2Name;
+    /**
+     * 一级代理商ID
+     */
+    private Integer level2Id;
+    /**
+     * 二级代理商名称
+     */
+    private String level3Name;
+    /**
+     * 二级代理商ID
+     */
+    private Integer level3Id;
+
+    private String appId;
+    private String appSecret;
+    private String rsaPublicKey;
+    private String queryUrl;
+    private String subjectName;
+
+    /**
+     * 税号
+     */
+    private String taxCode;
+
+    /**
+     * 结算主体类型：0->人力家，1->税邦云
+     */
+    private String[] subjectType;
+
+    /**
+     * 部门专用权限限制（字符串逗号分隔，0.导出）
+     */
+    private String[] deptPermissions;
+
+    @TableField(exist = false)
+    private List<String> subList;
+
+    /**
+     * gmv1收益率（万分之）
+     */
+    private Integer gmv1Rate;
+
+    /**
+     * gmv2收益率（万分之）
+     */
+    private Integer gmv2Rate;
+
+    /**
+     * 人力家服务费费率（万分之）
+     */
+    private Integer renlijiaServiceChargeRate;
+
+    /**
+     * 财务复核方式
+     */
+    private UpmsType.FinancialReviewType financialReviewType;
+
+    /**
+     * csm负责人
+     */
+    @TableField(exist = false)
+    private String csmNames;
+
+    /**
+     * csm负责人用户id
+     */
+    @TableField(exist = false)
+    private Integer[] csmUserIds;
+
+    /**
+     * 上级企业名称
+     */
+    @TableField(exist = false)
+    private String superDeptName;
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysMenuController.java

@@ -4,7 +4,6 @@ import com.qunzhixinxi.hnqz.admin.api.dto.MenuTree;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysMenu;
 import com.qunzhixinxi.hnqz.admin.api.vo.MenuVO;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysMenuService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -29,141 +28,140 @@ import java.util.stream.Collectors;
 @RequestMapping("/menu")
 public class SysMenuController {
 
-	private final SysMenuService sysMenuService;
-	private final SysDeptService sysDeptService;
-	private final SysDeptMapper sysDeptMapper;
-
-	/**
-	 * 返回当前用户的树形菜单集合
-	 * @param type 类型
-	 * @param parentId 父节点ID
-	 * @return 当前用户的树形菜单
-	 */
-	@GetMapping
-	public R getUserMenu(String type, Integer parentId) {
-
-		SysDept sysDept1 = new SysDept();
-		// 获取符合条件的菜单
-		Set<MenuVO> all = new HashSet<>();
-		List<Integer>  integerList=SecurityUtils.getRoles();
-		if(integerList.size()>1)
-		{
-			for (Integer integer:integerList) {
-				if(integer==5||integer==6)
-				{
-					integerList.remove(integer);
-					break;
-				}
-			}
-
-			for (Integer integer:integerList) {
-				if(integer==5||integer==6)
-				{
-					integerList.remove(integer);
-					break;
-				}
-			}
-		}
-		integerList.forEach(roleId -> all.addAll(sysMenuService.findMenuByRoleId(roleId)));
-		List<MenuTree> menuTreeList=sysMenuService.filterMenu(all, type, parentId);
-		SysDept sysDept=sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-
-		if(sysDept.getLevel()==4&&!integerList.contains(2))
-		{
-			if(menuTreeList.size()>0)
-			{
-				for (MenuTree menuTree: menuTreeList) {
-					if("档案管理".equals(menuTree.getName()))
-					{
-						menuTreeList.remove(menuTree);
-						break;
-					}
-
-				}
-			}
-		}
-
-		if((sysDept.getLevel()==4||sysDept.getLevel()==3)&&!integerList.contains(3)&&!integerList.contains(2)) {
-			if (menuTreeList.size() > 0) {
-				for (MenuTree menuTree : menuTreeList) {
-					if ("积分规则".equals(menuTree.getName())) {
-						menuTreeList.remove(menuTree);
-						break;
-					}
-
-				}
-			}
-		}
-		return R.ok(menuTreeList);
-	}
-
-	/**
-	 * 返回树形菜单集合
-	 * @param lazy 是否是懒加载
-	 * @param parentId 父节点ID
-	 * @return 树形菜单
-	 */
-	@GetMapping(value = "/tree")
-	public R getTree(boolean lazy, Integer parentId) {
-		return R.ok(sysMenuService.treeMenu(lazy, parentId));
-	}
-
-	/**
-	 * 返回角色的菜单集合
-	 * @param roleId 角色ID
-	 * @return 属性集合
-	 */
-	@GetMapping("/tree/{roleId}")
-	public R getRoleTree(@PathVariable Integer roleId) {
-		return R.ok(
-				sysMenuService.findMenuByRoleId(roleId).stream().map(MenuVO::getMenuId).collect(Collectors.toList()));
-	}
-
-	/**
-	 * 通过ID查询菜单的详细信息
-	 * @param id 菜单ID
-	 * @return 菜单详细信息
-	 */
-	@GetMapping("/{id}")
-	public R getById(@PathVariable Integer id) {
-		return R.ok(sysMenuService.getById(id));
-	}
-
-	/**
-	 * 新增菜单
-	 * @param sysMenu 菜单信息
-	 * @return success/false
-	 */
-	@SysLog("新增菜单")
-	@PostMapping
-	@PreAuthorize("@pms.hasPermission('sys_menu_add')")
-	public R save(@Valid @RequestBody SysMenu sysMenu) {
-		sysMenuService.save(sysMenu);
-		return R.ok(sysMenu);
-	}
-
-	/**
-	 * 删除菜单
-	 * @param id 菜单ID
-	 * @return success/false
-	 */
-	@SysLog("删除菜单")
-	@DeleteMapping("/{id}")
-	@PreAuthorize("@pms.hasPermission('sys_menu_del')")
-	public R removeById(@PathVariable Integer id) {
-		return sysMenuService.removeMenuById(id);
-	}
-
-	/**
-	 * 更新菜单
-	 * @param sysMenu
-	 * @return
-	 */
-	@SysLog("更新菜单")
-	@PutMapping
-	@PreAuthorize("@pms.hasPermission('sys_menu_edit')")
-	public R update(@Valid @RequestBody SysMenu sysMenu) {
-		return R.ok(sysMenuService.updateMenuById(sysMenu));
-	}
+    private final SysMenuService sysMenuService;
+    private final SysDeptService sysDeptService;
+
+    /**
+     * 返回当前用户的树形菜单集合
+     *
+     * @param type     类型
+     * @param parentId 父节点ID
+     * @return 当前用户的树形菜单
+     */
+    @GetMapping
+    public R<?> getUserMenu(String type, Integer parentId) {
+
+        // 获取符合条件的菜单
+        Set<MenuVO> all = new HashSet<>();
+        List<Integer> integerList = SecurityUtils.getRoles();
+        if (integerList.size() > 1) {
+            for (Integer integer : integerList) {
+                if (integer == 5 || integer == 6) {
+                    integerList.remove(integer);
+                    break;
+                }
+            }
+
+            for (Integer integer : integerList) {
+                if (integer == 5 || integer == 6) {
+                    integerList.remove(integer);
+                    break;
+                }
+            }
+        }
+        integerList.forEach(roleId -> all.addAll(sysMenuService.findMenuByRoleId(roleId)));
+        List<MenuTree> menuTreeList = sysMenuService.filterMenu(all, type, parentId);
+        SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+
+        if (sysDept.getLevel() == 4 && !integerList.contains(2)) {
+            if (!menuTreeList.isEmpty()) {
+                for (MenuTree menuTree : menuTreeList) {
+                    if ("档案管理".equals(menuTree.getName())) {
+                        menuTreeList.remove(menuTree);
+                        break;
+                    }
+
+                }
+            }
+        }
+
+        if ((sysDept.getLevel() == 4 || sysDept.getLevel() == 3) && !integerList.contains(3) && !integerList.contains(2)) {
+            if (!menuTreeList.isEmpty()) {
+                for (MenuTree menuTree : menuTreeList) {
+                    if ("积分规则".equals(menuTree.getName())) {
+                        menuTreeList.remove(menuTree);
+                        break;
+                    }
+
+                }
+            }
+        }
+        return R.ok(menuTreeList);
+    }
+
+    /**
+     * 返回树形菜单集合
+     *
+     * @param lazy     是否是懒加载
+     * @param parentId 父节点ID
+     * @return 树形菜单
+     */
+    @GetMapping(value = "/tree")
+    public R getTree(boolean lazy, Integer parentId) {
+        return R.ok(sysMenuService.treeMenu(lazy, parentId));
+    }
+
+    /**
+     * 返回角色的菜单集合
+     *
+     * @param roleId 角色ID
+     * @return 属性集合
+     */
+    @GetMapping("/tree/{roleId}")
+    public R getRoleTree(@PathVariable Integer roleId) {
+        return R.ok(
+                sysMenuService.findMenuByRoleId(roleId).stream().map(MenuVO::getMenuId).collect(Collectors.toList()));
+    }
+
+    /**
+     * 通过ID查询菜单的详细信息
+     *
+     * @param id 菜单ID
+     * @return 菜单详细信息
+     */
+    @GetMapping("/{id}")
+    public R getById(@PathVariable Integer id) {
+        return R.ok(sysMenuService.getById(id));
+    }
+
+    /**
+     * 新增菜单
+     *
+     * @param sysMenu 菜单信息
+     * @return success/false
+     */
+    @SysLog("新增菜单")
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('sys_menu_add')")
+    public R save(@Valid @RequestBody SysMenu sysMenu) {
+        sysMenuService.save(sysMenu);
+        return R.ok(sysMenu);
+    }
+
+    /**
+     * 删除菜单
+     *
+     * @param id 菜单ID
+     * @return success/false
+     */
+    @SysLog("删除菜单")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('sys_menu_del')")
+    public R removeById(@PathVariable Integer id) {
+        return sysMenuService.removeMenuById(id);
+    }
+
+    /**
+     * 更新菜单
+     *
+     * @param sysMenu
+     * @return
+     */
+    @SysLog("更新菜单")
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('sys_menu_edit')")
+    public R update(@Valid @RequestBody SysMenu sysMenu) {
+        return R.ok(sysMenuService.updateMenuById(sysMenu));
+    }
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -17,7 +17,6 @@ import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserInfo;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserPwd;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
@@ -25,22 +24,17 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
 import com.qunzhixinxi.hnqz.admin.api.model.WmQuizResultModel;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysCsmUserRelation;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptSub;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.api.dto.CommonUserDTO;
 import com.qunzhixinxi.hnqz.admin.api.model.input.UserCertificationInput;
 import com.qunzhixinxi.hnqz.admin.api.model.excel.CommonUserExcelModel;
-import com.qunzhixinxi.hnqz.admin.api.vo.SysUserSubVO;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectTypeEnum;
-import com.qunzhixinxi.hnqz.admin.mapper.*;
+import com.qunzhixinxi.hnqz.admin.mapper.SysCsmUserRelationMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.SysUserMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.SysUserRoleMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
-import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
-import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.admin.service.WmPlatformQuizTestResultService;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -54,11 +48,24 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -77,11 +84,8 @@ public class SysUserController {
 	private final SysUserService userService;
 	private final SysUserMapper sysUserMapper;
 	private final SysDeptService sysDeptService;
-	private final SysDeptSubService sysDeptSubService;
-	private final RedisTemplate redisTemplate;
+	private final RedisTemplate<String, Object> redisTemplate;
 	private final SysUserRoleMapper sysUserRoleMapper;
-	private final SysUserSubService sysUserSubService;
-	private final SysDictItemService sysDictItemService;
 	private final WmPlatformQuizTestResultService platformQuizTestResultService;
 	private final SysCsmUserRelationMapper sysCsmUserRelationMapper;
 
@@ -1022,50 +1026,50 @@ public class SysUserController {
 		}
 
 
-		// 封装结算通道
-		Set<Integer> deptIds = userVosPage.getRecords().stream().map(UserVO::getDeptId).collect(Collectors.toSet());
-
-		if (CollUtil.isNotEmpty(deptIds)) {
-			// 税源地
-			Map<Integer, Map<String, Integer>> coll = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery()
-							.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode())
-							.in(SysDeptSub::getDeptId, deptIds))
-					.stream()
-					.collect(Collectors.groupingBy(SysDeptSub::getDeptId,
-							Collectors.toMap(sysDeptSub -> sysDeptSub.getSubjectLocation().name(), SysDeptSub::getSubjectChannel)));
-
-			userVosPage.getRecords().forEach(item -> {
-				if ("0".equals(userDTO.getSubType())) {
-					item.setCertStatus(null);
-				} else if ("1".equals(userDTO.getSubType())) {
-					item.setRljCertStatus(null);
-				}
-
-				item.setSubjectTypeAndChannel(coll.get(item.getDeptId()));
-
-			});
-		}
-
-		// 登录人所属企业的结算配置信息
-		List<SubjectLocation> locations;
-		Integer deptId = SecurityUtils.getUser().getDeptId();
-		// 非平台用户，获取各自的配置项
-		if (1 != deptId) {
-			List<SysDeptSub> l = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, deptId).eq(SysDeptSub::getEnableFlag, "1"));
-			if (CollUtil.isNotEmpty(l)) {
-				locations = l.stream().filter(sub -> sub.getSubjectLocation() != null)
-						.map(sub -> Enum.valueOf(SubjectLocation.class, sub.getSubjectLocation().getType()))
-						.collect(Collectors.toList());
-			} else {
-				locations = Collections.emptyList();
-			}
-
-		}
-		// 平台管理员和admin获取全部
-		else {
-			List<SysDictItem> list = sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getType, "subject_location"));
-			locations = list.stream().map(item -> Enum.valueOf(SubjectLocation.class, item.getValue())).collect(Collectors.toList());
-		}
+		//// 封装结算通道
+		//Set<Integer> deptIds = userVosPage.getRecords().stream().map(UserVO::getDeptId).collect(Collectors.toSet());
+		//
+		//if (CollUtil.isNotEmpty(deptIds)) {
+		//	// 税源地
+		//	Map<Integer, Map<String, Integer>> coll = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery()
+		//					.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode())
+		//					.in(SysDeptSub::getDeptId, deptIds))
+		//			.stream()
+		//			.collect(Collectors.groupingBy(SysDeptSub::getDeptId,
+		//					Collectors.toMap(sysDeptSub -> sysDeptSub.getSubjectLocation().name(), SysDeptSub::getSubjectChannel)));
+		//
+		//	userVosPage.getRecords().forEach(item -> {
+		//		if ("0".equals(userDTO.getSubType())) {
+		//			item.setCertStatus(null);
+		//		} else if ("1".equals(userDTO.getSubType())) {
+		//			item.setRljCertStatus(null);
+		//		}
+		//
+		//		item.setSubjectTypeAndChannel(coll.get(item.getDeptId()));
+		//
+		//	});
+		//}
+		//
+		//// 登录人所属企业的结算配置信息
+		//List<SubjectLocation> locations;
+		//Integer deptId = SecurityUtils.getUser().getDeptId();
+		//// 非平台用户，获取各自的配置项
+		//if (1 != deptId) {
+		//	List<SysDeptSub> l = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, deptId).eq(SysDeptSub::getEnableFlag, "1"));
+		//	if (CollUtil.isNotEmpty(l)) {
+		//		locations = l.stream().filter(sub -> sub.getSubjectLocation() != null)
+		//				.map(sub -> Enum.valueOf(SubjectLocation.class, sub.getSubjectLocation().getType()))
+		//				.collect(Collectors.toList());
+		//	} else {
+		//		locations = Collections.emptyList();
+		//	}
+		//
+		//}
+		//// 平台管理员和admin获取全部
+		//else {
+		//	List<SysDictItem> list = sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getType, "subject_location"));
+		//	locations = list.stream().map(item -> Enum.valueOf(SubjectLocation.class, item.getValue())).collect(Collectors.toList());
+		//}
 
 		Map<Integer, List<SysCsmUserRelation>> csmParentUserMap = new HashMap<>();
 		if (CollUtil.isNotEmpty(userIds)) {
@@ -1078,65 +1082,65 @@ public class SysUserController {
 		}
 
 		userVosPage.getRecords().forEach(userVO -> {
-			// 查询所属企业渠道
-			SysDeptSub sysDeptSub = new SysDeptSub();
-			sysDeptSub.setDeptId(userVO.getDeptId());
-			sysDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-			List<SysDeptSub> subList = sysDeptSubService.list(Wrappers.query(sysDeptSub));
-
-			if (CollUtil.isNotEmpty(subList)) {
-				// 查询当前用户认证渠道
-				List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
-						.eq(SysUserSub::getDeptId, userVO.getDeptId())
-						.eq(SysUserSub::getUserId, userVO.getUserId()));
-
-				if (CollUtil.isNotEmpty(userSubList) && CollUtil.isNotEmpty(locations)) {
-
-					// 不同渠道认证名称，封装成中文名称数组格式
-					Map<SubjectLocation, SysUserSub> certStatusMap = userSubList.stream()
-							.collect(Collectors.toMap(SysUserSub::getSubjectLocation,
-									sysUserSub -> sysUserSub));
-
-					// 以企业配置并启用的税源地为基准，进行回显
-					List<SysUserSubVO> subVOS = locations.stream().map(loc -> {
-								SysUserSub sysUserSub = certStatusMap.get(loc);
-								if (sysUserSub != null) {
-									// 如果userSub存在该税源地对应的认证数据，则处理后返回
-									SysUserSubVO userSubVO = BeanUtil.copyProperties(sysUserSub, SysUserSubVO.class, "certStatus");
-									userSubVO.setCertStatus(GigTypeEnum.getCertStatusByCode(sysUserSub.getGigType(), sysUserSub.getCertStatus()));
-									userSubVO.setCertStatusDisplay(String.format("%s:%s", sysUserSub.getSubjectLocation().getDescription(),
-											GigTypeEnum.getCertStatusNameByCode(sysUserSub.getGigType(), sysUserSub.getCertStatus())));
-									return userSubVO;
-								} else {
-									// 如果userSub不存在该税源地对应的认证数据，则默认返回一条
-									SysUserSubVO userSubVO = new SysUserSubVO();
-									userSubVO.setUserId(userVO.getUserId());
-									userSubVO.setGigType(loc.getGigType());
-									userSubVO.setSubjectLocation(loc);
-									userSubVO.setCertStatus(GigTypeEnum.getCertStatusByCode(userSubVO.getGigType(), 0));
-									userSubVO.setCertStatusDisplay(String.format("%s:%s", userSubVO.getSubjectLocation().getDescription(),
-											GigTypeEnum.getCertStatusNameByCode(userSubVO.getGigType(), 0)));
-									return userSubVO;
-								}
-							}
-					).collect(Collectors.toList());
-					userVO.setCertList(subVOS);
-
-					// 该企业配置的所有税源地
-					List<SubjectLocation> subjectLocationList = subList.stream().map(SysDeptSub::getSubjectLocation).collect(Collectors.toList());
-
-					List<String> certStatusNameList = new ArrayList<>();
-					subjectLocationList.stream()
-							.sorted(Comparator.comparing(SubjectLocation::getSort))
-							.forEach(subjectLocation -> {
-								SysUserSub sysUserSub = certStatusMap.get(subjectLocation);
-								int certStatus = sysUserSub != null ? sysUserSub.getCertStatus() : 0;
-								certStatusNameList.add(GigTypeEnum.getCertStatusNameByCode(subjectLocation.getGigType(), certStatus));
-							});
-
-					userVO.setCertStatusArr(certStatusNameList.toArray(new String[0]));
-				}
-			}
+			//// 查询所属企业渠道
+			//SysDeptSub sysDeptSub = new SysDeptSub();
+			//sysDeptSub.setDeptId(userVO.getDeptId());
+			//sysDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
+			//List<SysDeptSub> subList = sysDeptSubService.list(Wrappers.query(sysDeptSub));
+			//
+			//if (CollUtil.isNotEmpty(subList)) {
+			//	// 查询当前用户认证渠道
+			//	List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
+			//			.eq(SysUserSub::getDeptId, userVO.getDeptId())
+			//			.eq(SysUserSub::getUserId, userVO.getUserId()));
+			//
+			//	if (CollUtil.isNotEmpty(userSubList) && CollUtil.isNotEmpty(locations)) {
+			//
+			//		// 不同渠道认证名称，封装成中文名称数组格式
+			//		Map<SubjectLocation, SysUserSub> certStatusMap = userSubList.stream()
+			//				.collect(Collectors.toMap(SysUserSub::getSubjectLocation,
+			//						sysUserSub -> sysUserSub));
+			//
+			//		// 以企业配置并启用的税源地为基准，进行回显
+			//		List<SysUserSubVO> subVOS = locations.stream().map(loc -> {
+			//					SysUserSub sysUserSub = certStatusMap.get(loc);
+			//					if (sysUserSub != null) {
+			//						// 如果userSub存在该税源地对应的认证数据，则处理后返回
+			//						SysUserSubVO userSubVO = BeanUtil.copyProperties(sysUserSub, SysUserSubVO.class, "certStatus");
+			//						userSubVO.setCertStatus(GigTypeEnum.getCertStatusByCode(sysUserSub.getGigType(), sysUserSub.getCertStatus()));
+			//						userSubVO.setCertStatusDisplay(String.format("%s:%s", sysUserSub.getSubjectLocation().getDescription(),
+			//								GigTypeEnum.getCertStatusNameByCode(sysUserSub.getGigType(), sysUserSub.getCertStatus())));
+			//						return userSubVO;
+			//					} else {
+			//						// 如果userSub不存在该税源地对应的认证数据，则默认返回一条
+			//						SysUserSubVO userSubVO = new SysUserSubVO();
+			//						userSubVO.setUserId(userVO.getUserId());
+			//						userSubVO.setGigType(loc.getGigType());
+			//						userSubVO.setSubjectLocation(loc);
+			//						userSubVO.setCertStatus(GigTypeEnum.getCertStatusByCode(userSubVO.getGigType(), 0));
+			//						userSubVO.setCertStatusDisplay(String.format("%s:%s", userSubVO.getSubjectLocation().getDescription(),
+			//								GigTypeEnum.getCertStatusNameByCode(userSubVO.getGigType(), 0)));
+			//						return userSubVO;
+			//					}
+			//				}
+			//		).collect(Collectors.toList());
+			//		userVO.setCertList(subVOS);
+			//
+			//		// 该企业配置的所有税源地
+			//		List<SubjectLocation> subjectLocationList = subList.stream().map(SysDeptSub::getSubjectLocation).collect(Collectors.toList());
+			//
+			//		List<String> certStatusNameList = new ArrayList<>();
+			//		subjectLocationList.stream()
+			//				.sorted(Comparator.comparing(SubjectLocation::getSort))
+			//				.forEach(subjectLocation -> {
+			//					SysUserSub sysUserSub = certStatusMap.get(subjectLocation);
+			//					int certStatus = sysUserSub != null ? sysUserSub.getCertStatus() : 0;
+			//					certStatusNameList.add(GigTypeEnum.getCertStatusNameByCode(subjectLocation.getGigType(), certStatus));
+			//				});
+			//
+			//		userVO.setCertStatusArr(certStatusNameList.toArray(new String[0]));
+			//	}
+			//}
 
 			// 上级csm
 			List<SysCsmUserRelation> csmUserRelations = csmParentUserMap.get(userVO.getUserId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysMenuServiceImpl.java

@@ -95,7 +95,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 	 * @param all 全部菜单
 	 * @param type 类型
 	 * @param parentId 父节点ID
-	 * @return
+	 * @return 菜单树
 	 */
 	@Override
 	public List<MenuTree> filterMenu(Set<MenuVO> all, String type, Integer parentId) {

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysDeptMapper.xml

@@ -25,6 +25,7 @@
 		<result property="rsaPublicKey" column="rsa_public_key"/>
 		<result property="queryUrl" column="query_url"/>
 		<result property="subjectName" column="subject_name"/>
+		<result property="financialReviewType" column="financial_review_type"/>
 		<result property="subjectType" column="subject_type" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
 		<result property="taxCode" column="tax_code"/>
 	</resultMap>