init: init project step4: biz code support

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

@@ -16,7 +16,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -169,13 +169,15 @@ public class SysRoleController {
 		} else if (rolesIdList.contains(1)){
 			queryWrapper.orderByAsc(SysRole::getRoleId);
 		} else {
-			List<Integer> drugEntAdmin = Stream.of(3,4,5,6,7,31).collect(Collectors.toList());
-			List<Integer> CSOAdmin = Stream.of(4,5,6,7,31,37).collect(Collectors.toList());
+			List<Integer> drugEntAdmin = Stream.of(3,4,5,6,7).collect(Collectors.toList());
+			List<Integer> CSOAdmin = Stream.of(4,5,6,7,37).collect(Collectors.toList());
+			List<Integer> CSO2Admin = Stream.of(5,6,7,37).collect(Collectors.toList());
 			List<Integer> CROAdmin = Stream.of(7,9,10).collect(Collectors.toList());
 			List<Integer> HCPAdmin = Stream.of(7,11,13).collect(Collectors.toList());
 			List<Integer> CFOAdmin = Stream.of(7).collect(Collectors.toList());
-			List<Integer> bcLeaderAdmin = Stream.of(2, 3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 34, 35).collect(Collectors.toList());
-			List<Integer> csmAdmin = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 34).collect(Collectors.toList());
+			List<Integer> bcLeaderAdmin = Stream.of(2, 3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 34, 35, 37).collect(Collectors.toList());
+			List<Integer> csmAdmin = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 34, 37).collect(Collectors.toList());
+
 
 			Set<Integer> queryRoleIdSet = new HashSet<>();
 
@@ -185,9 +187,11 @@ public class SysRoleController {
 						queryRoleIdSet.addAll(drugEntAdmin);
 						break;
 					case 4:
-					case 37:
 						queryRoleIdSet.addAll(CSOAdmin);
 						break;
+					case 37:
+						queryRoleIdSet.addAll(CSO2Admin);
+						break;
 					case 7:
 						queryRoleIdSet.addAll(CFOAdmin);
 						break;
@@ -206,7 +210,7 @@ public class SysRoleController {
 				}
 			});
 			if (CollUtil.isEmpty(queryRoleIdSet)) {
-				return R.ok(new ArrayList<>());
+				return R.ok(Collections.emptyList());
 			}
 
 			queryWrapper.in(SysRole::getRoleId, queryRoleIdSet).orderByAsc(SysRole::getRoleId);

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

@@ -837,7 +837,7 @@ public class SysUserController {
      * @return 用户集合
      */
     @GetMapping("/page")
-    public R<?> getUserPage(Page page, UserDTO userDTO) {
+    public R<Page<UserVO>> getUserPage(Page<UserVO> page, UserDTO userDTO) {
 
         return R.ok(userService.getUsersWithRolePageNoLock(page, userDTO));
     }
@@ -850,7 +850,7 @@ public class SysUserController {
      * @return 用户集合
      */
     @GetMapping("/selectUserList")
-    public R<?> selectUserList(Page page, UserDTO userDTO) {
+    public R<?> selectUserList(Page<UserVO> page, UserDTO userDTO) {
 
         userDTO.setSubType(null);
 
@@ -884,8 +884,6 @@ public class SysUserController {
                 vo.setAreaCodes(areaCodes);
 
             });
-
-
         }
 
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysUserMapper.java

@@ -1,9 +1,6 @@
-
-
 package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
@@ -14,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * <p>
@@ -27,84 +23,84 @@ import java.util.Set;
 @Mapper
 public interface SysUserMapper extends DataScopeMapper<SysUser> {
 
-	/**
-	 * 通过用户名查询用户信息（含有角色信息）
-	 * @param username 用户名
-	 * @return userVo
-	 */
-	UserVO getUserVoByUsername(String username);
-
-	/**
-	 * 分页查询用户信息（含角色）
-	 * @param page 分页
-	 * @param userDTO 查询参数
-	 * @param dataScope
-	 * @return list
-	 */
-	IPage<UserVO> getUserVosPage(Page page, @Param("query") UserDTO userDTO, DataScope dataScope);
-
-	IPage<UserVO> getUserVosPageNoLock(Page page, @Param("query") UserDTO userDTO, DataScope dataScope);
-
-	IPage<UserVO> selectUserList(Page page, @Param("query") UserDTO userDTO, DataScope dataScope);
-
-
-	IPage<UserVO> selectListByExtEntNoPage(Page page, @Param("query") UserDTO userDTO, DataScope dataScope);
-
-
-	List<UserVO> getUserVoByPlatId(@Param("query") UserDTO userDTO);
-
-	List<UserVO> selectByPhone(@Param("query") UserDTO userDTO);
-	@SqlParser(filter=true)
-	List<UserVO> selectByDeptId(@Param("query")UserDTO userDTO);
-
-	UserVO selectByUserId(@Param("query")UserDTO userDTO);
-
-	void updateByPrimaryKeySelective(SysUser sysUser);
-
-
-	/**
-	 * 通过ID查询用户信息
-	 * @param id 用户ID
-	 * @return userVo
-	 */
-	UserVO getUserVoById(Integer id);
-
-	/**
-	 * 忽略逻辑删除
-	 * 查询数据库的用户信息（包含已逻辑删除的数据） del_flag = 0
-	 * @param id
-	 * @return
-	 */
-	SysUser getByIdIgnore(String id);
-
-	SysUser selectUserByName(SysUser sysUser);
-
-	List<SysUser> selectUserById(SysUser sysUser);
-
-	/**
-	 * 根据部门id和角色id查询
-	 *
-	 * @param deptId
-	 * @param realNameOrPhone
-	 * @param roleList
-	 * @return
-	 */
-	List<SysUser> selectByDeptIdAndRoleId(@Param("deptId") Integer deptId, @Param("realNameOrPhone") String realNameOrPhone,
-										  @Param("roleList") List<Integer> roleList);
-
-	/**
-	 * 获取用户信息
-	 *
-	 * @param userIds 用户id列表
-	 * @return 用户信息集合
-	 */
-	List<SysUser> listUserDetails(@Param(value = "userIds") List<Integer> userIds);
-
-	/**
-	 * 按角色查询用户
-	 *
-	 * @param userDTO 用户 DTO
-	 * @return {@link List}<{@link SysUser}> 结果
-	 */
-	List<UserVO> listUserByRole(@Param("query") UserDTO userDTO);
+    /**
+     * 通过用户名查询用户信息（含有角色信息）
+     *
+     * @param username 用户名
+     * @return userVo
+     */
+    UserVO getUserVoByUsername(String username);
+
+    /**
+     * 分页查询用户信息（含角色）
+     *
+     * @param page      分页
+     * @param userDTO   查询参数
+     * @param dataScope 作用域
+     * @return list
+     */
+    Page<UserVO> getUserVosPage(Page<UserVO> page, @Param("query") UserDTO userDTO, DataScope dataScope);
+
+    Page<UserVO> getUserVosPageNoLock(Page<UserVO> page, @Param("query") UserDTO userDTO, DataScope dataScope);
+
+    List<UserVO> getUserVoByPlatId(@Param("query") UserDTO userDTO);
+
+    List<UserVO> selectByPhone(@Param("query") UserDTO userDTO);
+
+    @SqlParser(filter = true)
+    List<UserVO> selectByDeptId(@Param("query") UserDTO userDTO);
+
+    UserVO selectByUserId(@Param("query") UserDTO userDTO);
+
+    void updateByPrimaryKeySelective(SysUser sysUser);
+
+
+    /**
+     * 通过ID查询用户信息
+     *
+     * @param id 用户ID
+     * @return userVo
+     */
+    UserVO getUserVoById(Integer id);
+
+    /**
+     * 忽略逻辑删除
+     * 查询数据库的用户信息（包含已逻辑删除的数据） del_flag = 0
+     *
+     * @param id 用户ID
+     * @return 用户信息
+     */
+    SysUser getByIdIgnore(String id);
+
+    SysUser selectUserByName(SysUser sysUser);
+
+    List<SysUser> selectUserById(SysUser sysUser);
+
+    /**
+     * 根据部门id和角色id查询
+     *
+     * @param deptId          部门ID
+     * @param realNameOrPhone 真实姓名或手机号
+     * @param roleList        角色列表
+     * @return 用户列表
+     */
+    List<SysUser> selectByDeptIdAndRoleId(@Param("deptId") Integer deptId,
+										  @Param("realNameOrPhone") String realNameOrPhone,
+                                          @Param("roleList") List<Integer> roleList);
+
+    /**
+     * 获取用户信息
+     *
+     * @param userIds 用户id列表
+     * @return 用户信息集合
+     */
+    List<SysUser> listUserDetails(@Param(value = "userIds") List<Integer> userIds);
+
+    /**
+     * 按角色查询用户
+     *
+     * @param userDTO 用户 DTO
+     * @return {@link List}<{@link SysUser}> 结果
+     */
+    List<UserVO> listUserByRole(@Param("query") UserDTO userDTO);
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysEnterpriseArea;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +32,12 @@ public interface SysEnterpriseAreaService extends IService<SysEnterpriseArea> {
      */
     List<Long> listEntAreas(Collection<Long> deptId);
 
+    /**
+     * 查询企业的所属区域
+     *
+     * @param deptId 部门ID
+     * @return 映射关系
+     */
     Map<Long, List<Long>> listEntAreas1(Collection<Long> deptId);
 
     /**

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

@@ -1,4 +1,3 @@
-
 package com.qunzhixinxi.hnqz.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -14,13 +13,14 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysRoleMenu;
  */
 public interface SysRoleMenuService extends IService<SysRoleMenu> {
 
-	/**
-	 * 更新角色菜单
-	 * @param role
-	 * @param roleId 角色
-	 * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔
-	 * @return
-	 */
-	Boolean saveRoleMenus(String role, Integer roleId, String menuIds);
+    /**
+     * 更新角色菜单
+     *
+     * @param role    角色名称
+     * @param roleId  角色
+     * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔
+     * @return 更新结果
+     */
+    Boolean saveRoleMenus(String role, Integer roleId, String menuIds);
 
 }

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

@@ -37,11 +37,11 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @param page    分页对象
      * @param userDTO 参数列表
-     * @return
+     * @return 分页列表
      */
-    IPage getUsersWithRolePage(Page page, UserDTO userDTO);
+    Page<UserVO> getUsersWithRolePage(Page<UserVO> page, UserDTO userDTO);
 
-    IPage getUsersWithRolePageNoLock(Page page, UserDTO userDTO);
+    Page<UserVO> getUsersWithRolePageNoLock(Page<UserVO> page, UserDTO userDTO);
 
     IPage selectUserList(Page page, UserDTO userDTO);
 

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

@@ -174,10 +174,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
     @Override
     public List<SysDept> selectDeptByName(SysDept sysDept) {
-        List<SysDept> deptList = new ArrayList<>();
+        List<SysDept> deptList;
         if (SecurityUtils.getRoles().contains(1) || SecurityUtils.getRoles().contains(2)) {
-            List<SysDept> sysDeptList = deptMapper.selectListByDept(sysDept);
-            return sysDeptList;
+            deptList = deptMapper.selectListByDept(sysDept);
         } else {
             sysDept.setDeptId(SecurityUtils.getUser().getDeptId());
             deptList = deptMapper.selectDeptByName(sysDept);

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

@@ -13,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -68,6 +67,13 @@ public class SysEnterpriseAreaServiceImpl extends ServiceImpl<SysEnterpriseAreaM
         return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().in(SysEnterpriseArea::getEntId, deptId)).stream().map(SysEnterpriseArea::getAreaId).collect(Collectors.toList());
     }
 
+
+    /**
+     * 查询企业的所属区域
+     *
+     * @param deptId 部门ID
+     * @return 映射关系
+     */
     @Override
     public Map<Long, List<Long>> listEntAreas1(Collection<Long> deptId) {
         return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().in(SysEnterpriseArea::getEntId, deptId)).stream().collect(Collectors.groupingBy(SysEnterpriseArea::getEntId, Collectors.mapping(SysEnterpriseArea::getAreaId, Collectors.toList())));

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

@@ -33,10 +33,12 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
 	private final CacheManager cacheManager;
 
 	/**
-	 * @param role
-	 * @param roleId 角色
+	 * 更新角色菜单
+	 *
+	 * @param role    角色名称
+	 * @param roleId  角色
 	 * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔
-	 * @return
+	 * @return 更新结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)

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

@@ -595,8 +595,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             });
         }
 
-		// 管理区域管理
-		userAreaService.saveRelation(Long.valueOf(sysUser.getUserId()), userDto.getAreaCodes());
+        // 管理区域管理
+        userAreaService.saveRelation(Long.valueOf(sysUser.getUserId()), userDto.getAreaCodes());
 
         return Boolean.TRUE;
     }
@@ -636,7 +636,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @return
      */
     @Override
-    public IPage getUsersWithRolePage(Page page, UserDTO userDTO) {
+    public Page<UserVO> getUsersWithRolePage(Page<UserVO> page, UserDTO userDTO) {
         return baseMapper.getUserVosPage(page, userDTO, new DataScope());
     }
 
@@ -645,10 +645,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      *
      * @param page    分页对象
      * @param userDTO 参数列表
-     * @return
+     * @return 分页结果
      */
     @Override
-    public IPage getUsersWithRolePageNoLock(Page page, UserDTO userDTO) {
+    public Page<UserVO> getUsersWithRolePageNoLock(Page<UserVO> page, UserDTO userDTO) {
         return baseMapper.getUserVosPageNoLock(page, userDTO, new DataScope());
     }
 
@@ -862,7 +862,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
 
         // 更新区域
-        if (CollUtil.isNotEmpty(userDto.getAreaCodes())){
+        if (CollUtil.isNotEmpty(userDto.getAreaCodes())) {
             // 删除历史的
             userAreaService.delUserArea(Long.valueOf(sysUser.getUserId()));
             // 插入新的