Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:新增查询列表的权限校验"

See merge request fangxinjiang/yifu!136

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java

@@ -126,6 +126,10 @@ public interface CommonConstants {
 
 	String FIVE_STRING = "5";
 
+	String TWELVE_STRING = "12";
+
+	String THIRTEEN_STRING = "13";
+
 	/**
 	 * number 0
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -542,6 +542,21 @@ public class InsurancesConstants {
 	 */
 	public static final String DEPT_NO_CHANGE_NOT_EMPTY = "替换项目编码不能为空";
 
+	/**
+	 * 无替换项目的操作权限
+	 */
+	public static final String NEW_DEPT_NO_NOT_IN_DEPT_LIST = "无替换项目的操作权限";
+
+	/**
+	 * 无被替换项目的操作权限
+	 */
+	public static final String OLD_DEPT_NO_NOT_IN_DEPT_LIST = "无被替换项目的操作权限";
+
+	/**
+	 * 无该项目的操作权限
+	 */
+	public static final String DEPT_NO_NOT_IN_USER_DEPT_LIST = "无该项目的操作权限";
+
 	/**
 	 * 替换项目不存在
 	 */
@@ -587,6 +602,11 @@ public class InsurancesConstants {
 	 */
 	public static final String USER_DATA_IS_NOT_EXIST = "员工投保记录不存在";
 
+	/**
+	 * 无该投保记录的操作权限
+	 */
+	public static final String DEPT_NO_NOT_IN_DEPT_LIST = "无该投保记录的操作权限";
+
 	/**
 	 * 存在多条在保记录
 	 */
@@ -752,11 +772,4 @@ public class InsurancesConstants {
 	public static final String NOT_CREATE_USER_DELETE_ERROR = "非创建人无法删除保单信息";
 
 
-	/**
-	 * 非创建人无法进行出险
-	 */
-	public static final String NOT_CREATE_USER_UPDATE_IS_USE_ERROR = "非创建人无法进行出险";
-
-
-
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -71,24 +71,51 @@ public class TInsuranceDetailController {
 	 * @return {@link R<IPage<InsuranceListVO>>}
 	 */
 	@Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
+	@PostMapping("/getInsuranceHandleListPage")
+	public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param));
+	}
+
+	/**
+	 * 投保分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link R<IPage<InsuranceListVO>>}
+	 */
+	@Operation(summary = "投保分页查询", description = "投保分页查询")
 	@PostMapping("/getInsuranceListPage")
 	public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
 		return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param));
 	}
 
 	/**
-	 * 投保办理不分页查询
+	 * 投保不分页查询
 	 *
 	 * @author licancan
 	 * @param param
 	 * @return {@link R<List<InsuranceListVO>>}
 	 */
-	@Operation(summary = "投保办理不分页查询", description = "投保办理不分页查询")
+	@Operation(summary = "投保不分页查询", description = "投保不分页查询")
 	@PostMapping("/getInsuranceList")
 	public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param) {
 		return R.ok(tInsuranceDetailService.getInsuranceList(param));
 	}
 
+	/**
+	 * 投保办理不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link R<List<InsuranceListVO>>}
+	 */
+	@Operation(summary = "投保办理不分页查询", description = "投保办理不分页查询")
+	@PostMapping("/getInsuranceHandleList")
+	public R<List<InsuranceListVO>> getInsuranceHandleList(@RequestBody InsuranceListParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceHandleList(param));
+	}
+
 	/**
 	 * 商险新增
 	 *
@@ -414,7 +441,7 @@ public class TInsuranceDetailController {
 	@Operation(summary = "查询项目列表", description = "查询项目列表")
 	@GetMapping("/deptList")
 	public R getDeptList() {
-		return tInsuranceDetailService.getDeptList();
+		return tInsuranceDetailService.getDeptListByUser();
 	}
 
 	/**

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	/***********************商险办理********************************/
 	/**
-	 * 投保办理分页查询
+	 * 投保分页查询
 	 *
 	 * @author licancan
 	 * @param page
@@ -29,6 +29,25 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 */
 	IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, @Param("param") InsuranceListParam param);
 
+	/**
+	 * 投保不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link List<InsuranceListVO>}
+	 */
+	List<InsuranceListVO> getInsuranceList(@Param("param") InsuranceListParam param);
+
+	/**
+	 * 投保办理分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link IPage< InsuranceListVO>}
+	 */
+	IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, @Param("param") InsuranceListParam param);
+
 	/**
 	 * 投保办理不分页查询
 	 *
@@ -36,7 +55,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 * @param param
 	 * @return {@link List<InsuranceListVO>}
 	 */
-    List<InsuranceListVO> getInsuranceList(@Param("param") InsuranceListParam param);
+	List<InsuranceListVO> getInsuranceHandleList(@Param("param") InsuranceListParam param);
 
 	/**
 	 * 通过id查询

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java

@@ -38,7 +38,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	R<String> updateInsuranceSettle(UpdateInsuranceSettleParam param);
 
 	/**
-	 * 投保办理分页查询
+	 * 投保分页查询
 	 *
 	 * @author licancan
 	 * @param page
@@ -48,7 +48,18 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param);
 
 	/**
-	 * 投保办理不分页查询
+	 * 投保办理分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link IPage<InsuranceListVO>}
+	 */
+	IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param);
+
+
+	/**
+	 * 投保不分页查询
 	 *
 	 * @author licancan
 	 * @param param
@@ -56,6 +67,15 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 */
 	List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
 
+	/**
+	 * 投保办理不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link List<InsuranceListVO>}
+	 */
+	List<InsuranceListVO> getInsuranceHandleList(InsuranceListParam param);
+
 	/**
 	 * 商险新增
 	 *

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java

@@ -160,7 +160,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	}
 
 	/**
-	 * 投保办理分页查询
+	 * 投保分页查询
 	 *
 	 * @param page
 	 * @param param
@@ -170,7 +170,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	@Override
 	public IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param) {
 		//todo 根据登录人获取数据权限
-		IPage<InsuranceListVO> insuranceList = baseMapper.getInsuranceListPage(page,param);
+		YifuUser user = SecurityUtils.getUser();
+		List<String> deptNoList = getDeptNoList(user);
+		IPage<InsuranceListVO> insuranceList = new Page<>();
+		if (CollectionUtils.isEmpty(deptNoList)){
+			return insuranceList;
+		}
+		param.setDeptNoList(deptNoList);
+		insuranceList = baseMapper.getInsuranceListPage(page,param);
 		//根据项目编码获取项目名称
 		setProjectNameByDeptNo(insuranceList.getRecords());
 		// 购买月数
@@ -183,7 +190,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	}
 
 	/**
-	 * 投保办理不分页查询
+	 * 投保不分页查询
 	 *
 	 * @param param
 	 * @return {@link List<InsuranceListVO>}
@@ -192,7 +199,58 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	@Override
 	public List<InsuranceListVO> getInsuranceList(InsuranceListParam param) {
 		//todo 根据登录人获取数据权限
-		List<InsuranceListVO> insuranceList = baseMapper.getInsuranceList(param);
+		YifuUser user = SecurityUtils.getUser();
+		List<String> deptList = getDeptNoList(user);
+		List<InsuranceListVO> insuranceList = new ArrayList<>();
+		if (CollectionUtils.isEmpty(deptList)){
+			return insuranceList;
+		}
+		param.setDeptNoList(deptList);
+		insuranceList = baseMapper.getInsuranceList(param);
+		//根据项目编码获取项目名称
+		setProjectNameByDeptNo(insuranceList);
+		// 购买月数
+		if (CollectionUtils.isNotEmpty(insuranceList)){
+			insuranceList.stream().forEach(e ->{
+				e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
+			});
+		}
+		return insuranceList;
+	}
+	/**
+	 * 投保办理分页查询
+	 *
+	 * @param page
+	 * @param param
+	 * @return {@link IPage < InsuranceListVO >}
+	 * @author licancan
+	 */
+	@Override
+	public IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param) {
+		//todo 根据登录人获取数据权限
+		IPage<InsuranceListVO> insuranceList = baseMapper.getInsuranceHandleListPage(page,param);
+		//根据项目编码获取项目名称
+		setProjectNameByDeptNo(insuranceList.getRecords());
+		// 购买月数
+		if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
+			insuranceList.getRecords().stream().forEach(e ->{
+				e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
+			});
+		}
+		return insuranceList;
+	}
+
+	/**
+	 * 投保办理不分页查询
+	 *
+	 * @param param
+	 * @return {@link List<InsuranceListVO>}
+	 * @author licancan
+	 */
+	@Override
+	public List<InsuranceListVO> getInsuranceHandleList(InsuranceListParam param) {
+		//todo 根据登录人获取数据权限
+		List<InsuranceListVO> insuranceList = baseMapper.getInsuranceHandleList(param);
 		//根据项目编码获取项目名称
 		setProjectNameByDeptNo(insuranceList);
 		// 购买月数
@@ -221,7 +279,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
-		Map<String, List<InsuranceAddParam>> map = addInsuranceCheck(paramList);
+		Map<String, List<InsuranceAddParam>> map = addInsuranceCheck(paramList,user);
 		//返回给前端的结果
 		List<InsuranceAddParam> listResult = map.get("listResult");
 		//保存到数据库中的结果
@@ -268,7 +326,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
-		Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList);
+		Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList,user);
 		//返回给前端的结果
 		List<InsuranceBatchParam> listResult = map.get("listResult");
 		//保存到数据库中的结果
@@ -313,7 +371,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
-		Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList);
+		Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList,user);
 		//返回给前端的结果
 		List<InsuranceReplaceParam> listResult = map.get("listResult");
 		//保存到数据库中的结果
@@ -1083,7 +1141,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param paramList
 	 * @return {@link Map<String, List<InsuranceAddParam>>}
 	 */
-	private Map<String,List<InsuranceAddParam>> addInsuranceCheck(List<InsuranceAddParam> paramList){
+	private Map<String,List<InsuranceAddParam>> addInsuranceCheck(List<InsuranceAddParam> paramList,YifuUser user){
+		List<String> deptNoList = getDeptNoList(user);
 		Map<String,List<InsuranceAddParam>> map = new HashMap<>();
 		List<InsuranceAddParam> listResult = new ArrayList<>();
 		List<InsuranceAddParam> listSuccess = new ArrayList<>();
@@ -1211,7 +1270,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				listResult.add(param);
 				continue;
 			}
-
+			//校验当前项目是否在权限范围内
+			if(!deptNoList.stream().anyMatch(u ->u.equals(param.getDeptNo()))){
+				param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_IN_USER_DEPT_LIST);
+				listResult.add(param);
+				continue;
+			}
 			//表内数据重复 员工姓名、员工身份证号码、保险公司、险种、起止时间（有交叉）
 			for (int j = 0; j < distinctList.size(); j++) {
 				InsuranceAddParam repeat = distinctList.get(j);
@@ -1458,7 +1522,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param paramList
 	 * @return {@link Map< String, List< InsuranceBatchParam>>}
 	 */
-	private Map<String,List<InsuranceBatchParam>> batchInsuranceCheck(List<InsuranceBatchParam> paramList){
+	private Map<String,List<InsuranceBatchParam>> batchInsuranceCheck(List<InsuranceBatchParam> paramList,YifuUser user){
+		List<String> deptNoList = getDeptNoList(user);
 		Map<String,List<InsuranceBatchParam>> map = new HashMap<>();
 		List<InsuranceBatchParam> listResult = new ArrayList<>();
 		List<InsuranceBatchParam> listSuccess = new ArrayList<>();
@@ -1556,7 +1621,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				listResult.add(param);
 				continue;
 			}
-
+			//校验当前项目是否在权限范围内
+			if(!deptNoList.stream().anyMatch(u ->u.equals(param.getDeptNo()))){
+				param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_IN_USER_DEPT_LIST);
+				listResult.add(param);
+				continue;
+			}
 			//表内数据重复 员工姓名、员工身份证号码、保险公司、险种
 			for (int j = 0; j < distinctList.size(); j++) {
 				InsuranceBatchParam repeat = distinctList.get(j);
@@ -1804,7 +1874,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param paramList
 	 * @return {@link Map< String, List<InsuranceReplaceParam>>}
 	 */
-	private Map<String,List<InsuranceReplaceParam>> replaceInsuranceCheck(List<InsuranceReplaceParam> paramList){
+	private Map<String,List<InsuranceReplaceParam>> replaceInsuranceCheck(List<InsuranceReplaceParam> paramList,YifuUser user){
+		List<String> deptNoList = getDeptNoList(user);
 		Map<String,List<InsuranceReplaceParam>> map = new HashMap<>();
 		List<InsuranceReplaceParam> listResult = new ArrayList<>();
 		List<InsuranceReplaceParam> listSuccess = new ArrayList<>();
@@ -1903,7 +1974,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				listResult.add(param);
 				continue;
 			}
-
+			//校验当前项目是否在权限范围内
+			if(!deptNoList.stream().anyMatch(u ->u.equals(param.getDeptNo()))){
+				param.setErrorMessage(InsurancesConstants.OLD_DEPT_NO_NOT_IN_DEPT_LIST);
+				listResult.add(param);
+				continue;
+			}
+			//校验当前项目是否在权限范围内
+			if(!deptNoList.stream().anyMatch(u ->u.equals(param.getReplaceDeptNo()))){
+				param.setErrorMessage(InsurancesConstants.NEW_DEPT_NO_NOT_IN_DEPT_LIST);
+				listResult.add(param);
+				continue;
+			}
 			//表内数据重复 员工姓名、员工身份证号码、保险公司、险种、起止时间（有交叉）
 			for (int j = 0; j < distinctList.size(); j++) {
 				InsuranceReplaceParam repeat = distinctList.get(j);
@@ -2383,7 +2465,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(!Common.isNotEmpty(insuranceRefundCheckList)){
 			return R.failed("当前导入的减员信息为空");
 		}
-		Map<String, List<InsuranceRefundCheck>> refundMap = checkInsuranceRefundList(insuranceRefundCheckList);
+		Map<String, List<InsuranceRefundCheck>> refundMap = checkInsuranceRefundList(insuranceRefundCheckList,user);
 		List<InsuranceRefundCheck> successList = refundMap.get("successList");
 		List<TInsuranceOperate> operateList = new ArrayList<>();
 		if (CollectionUtils.isNotEmpty(successList)){
@@ -2434,13 +2516,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	public IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param) {
 		//todo 根据登录人获取其项目权限列表
 		YifuUser user = SecurityUtils.getUser();
-		List<String> deptList = new ArrayList<>(16);
-		deptList.add("皖M02002");
-		deptList.add("皖A12345678");
-		deptList.add("皖B29203");
-		deptList.add("皖M02023");
+		List<String> deptList = getDeptNoList(user);
+		IPage<InsuredListVo> insuranceList = new Page<>();
+		if (CollectionUtils.isEmpty(deptList)){
+			return insuranceList;
+		}
 		param.setDeptNoList(deptList);
-		IPage<InsuredListVo> insuranceList = this.baseMapper.getInsuredListPage(page, param);
+		insuranceList = this.baseMapper.getInsuredListPage(page, param);
 		if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
 			//根据项目编码获取项目名称
 			List<String> collect = insuranceList.getRecords().stream().map(e -> e.getDeptNo()).distinct().collect(Collectors.toList());
@@ -2471,13 +2553,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	public List<InsuredListVo> getInsuredList(InsuredParam param) {
 		//todo 根据登录人获取其项目权限列表
 		YifuUser user = SecurityUtils.getUser();
-		List<String> deptList = new ArrayList<>(16);
-		deptList.add("皖M02002");
-		deptList.add("皖A12345678");
-		deptList.add("皖B29203");
-		deptList.add("皖M02023");
+		List<String> deptList = getDeptNoList(user);
+		List<InsuredListVo> insuredList = new ArrayList<>();
+		if (CollectionUtils.isEmpty(deptList)){
+			return insuredList;
+		}
+		param.setDeptNoList(deptList);
 		param.setDeptNoList(deptList);
-		List<InsuredListVo> insuredList = this.baseMapper.getInsuredList(param);
+		insuredList = this.baseMapper.getInsuredList(param);
 		if (CollectionUtils.isNotEmpty(insuredList)){
 			//根据项目编码获取项目名称
 			List<String> collect = insuredList.stream().map(e -> e.getDeptNo()).distinct().collect(Collectors.toList());
@@ -2509,11 +2592,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	public R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param) {
 		//todo 根据登录人获取其项目权限列表
 		YifuUser user = SecurityUtils.getUser();
-		List<String> deptList = new ArrayList<>(16);
-		deptList.add("皖M02002");
-		deptList.add("皖A12345678");
-		deptList.add("皖B29203");
-		deptList.add("皖M02023");
+		List<String> deptList = getDeptNoList(user);
 		if (CollectionUtils.isEmpty(deptList)){
 			return R.ok("当前登录人无任何项目权限");
 		}
@@ -2752,7 +2831,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(!Common.isNotEmpty(settleMonthCheckList)){
 			return R.failed(InsurancesConstants.SETTLE_MONTH_CHANGE_LIST_IS_EMPTY);
 		}
-		Map<String, List<SettleMonthChangeCheckParam>> map = settleMonthChangeCheck(settleMonthCheckList);
+		Map<String, List<SettleMonthChangeCheckParam>> map = settleMonthChangeCheck(settleMonthCheckList,user);
 		//todo 生成EKP通知，通知ekp变更结算月份
 		List<SettleMonthChangeCheckParam> successList = map.get("successList");
 		List<TInsuranceOperate> operateList = new ArrayList<>();
@@ -2792,7 +2871,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(!Common.isNotEmpty(deptChangeCheckList)){
 			return R.failed("当前变更所属项目列表为空");
 		}
-		Map<String, List<DeptChangeCheckParam>> stringListMap = deptChangeCheck(deptChangeCheckList);
+		Map<String, List<DeptChangeCheckParam>> stringListMap = deptChangeCheck(deptChangeCheckList,user);
 		//todo 生成EKP通知，通知ekp变更结算所属项目
 		List<DeptChangeCheckParam> successList = stringListMap.get("successList");
 		List<TInsuranceOperate> operateList = new ArrayList<>();
@@ -3212,11 +3291,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(Common.isEmpty(insuranceDetail) || CommonConstants.ONE_INT == insuranceDetail.getDeleteFlag()){
 			return R.failed("保单信息不存在或已被删除");
 		}
-		//校验当前保单信息是否由当前登录人创建
-		String createBy = insuranceDetail.getCreateBy();
-		if(!createBy.equals(user.getId())){
-			return R.failed(InsurancesConstants.NOT_CREATE_USER_UPDATE_IS_USE_ERROR);
-		}
 		Integer reduceHandleStatus = insuranceDetail.getReduceHandleStatus();
 		Integer buyHandleStatus = insuranceDetail.getBuyHandleStatus();
 		if(CommonConstants.ONE_INT == buyHandleStatus || CommonConstants.TWO_INT == buyHandleStatus ||CommonConstants.FOUR_INT == buyHandleStatus){
@@ -3283,7 +3357,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param insuranceRefundCheckList 减员表
 	 * @return {@link R}
 	 */
-	public Map<String,List<InsuranceRefundCheck>> checkInsuranceRefundList(List<InsuranceRefundCheck> insuranceRefundCheckList){
+	public Map<String,List<InsuranceRefundCheck>> checkInsuranceRefundList(List<InsuranceRefundCheck> insuranceRefundCheckList,YifuUser user){
+		List<String> deptNoList = getDeptNoList(user);
 		List<InsuranceRefundCheck> errorList = new ArrayList<>(128);
 		List<InsuranceRefundCheck> successList = new ArrayList<>();
 		Map<String,List<InsuranceRefundCheck>> map = new HashMap<>();
@@ -3374,6 +3449,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			if(!deptNoList.stream().anyMatch(u -> u.equals(one.getDeptNo()))){
+				param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_IN_DEPT_LIST);
+				errorList.add(param);
+				continue;
+			}
 			//当前保单信息的不是已投保状态不能导入
 			Integer buyHandleStatus = one.getBuyHandleStatus();
 			//商险待投保，无法减员
@@ -3520,7 +3600,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param settleMonthCheckList 变更列表
 	 * @return {@link R}
 	 */
-	private Map<String,List<SettleMonthChangeCheckParam>> settleMonthChangeCheck(List<SettleMonthChangeCheckParam> settleMonthCheckList) {
+	private Map<String,List<SettleMonthChangeCheckParam>> settleMonthChangeCheck(List<SettleMonthChangeCheckParam> settleMonthCheckList,YifuUser user) {
+		List<String> deptNoList = getDeptNoList(user);
 		Map<String,List<SettleMonthChangeCheckParam>> map = new HashMap<>(16);
 		List<SettleMonthChangeCheckParam> errorList = new ArrayList<>();
 		List<SettleMonthChangeCheckParam> successList = new ArrayList<>();
@@ -3546,6 +3627,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			if(!deptNoList.stream().anyMatch(u ->u.equals(deptNo))){
+				param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_IN_USER_DEPT_LIST);
+				errorList.add(param);
+				continue;
+			}
 			//保险公司名称
 			String insuranceCompanyName = param.getInsuranceCompanyName();
 			if(StringUtils.isBlank(insuranceCompanyName)){
@@ -3720,7 +3806,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param deptChangeCheckList 变更列表
 	 * @return {@link R}
 	 */
-	public Map<String,List<DeptChangeCheckParam>> deptChangeCheck(List<DeptChangeCheckParam> deptChangeCheckList) {
+	public Map<String,List<DeptChangeCheckParam>> deptChangeCheck(List<DeptChangeCheckParam> deptChangeCheckList,YifuUser user) {
+		List<String> deptNoList = getDeptNoList(user);
 		Map<String,List<DeptChangeCheckParam>> map = new HashMap<>(16);
 		List<DeptChangeCheckParam> errorList = new ArrayList<>();
 		List<DeptChangeCheckParam> successList = new ArrayList<>();
@@ -3733,6 +3820,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			if(!deptNoList.stream().anyMatch(u ->u.equals(newDeptNo))){
+				param.setErrorMessage(InsurancesConstants.NEW_DEPT_NO_NOT_IN_DEPT_LIST);
+				errorList.add(param);
+				continue;
+			}
 			//员工姓名
 			String empName = param.getEmpName();
 			if(StringUtils.isBlank(empName)){
@@ -3754,6 +3846,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			if(!deptNoList.stream().anyMatch(u ->u.equals(oldDeptNo))){
+				param.setErrorMessage(InsurancesConstants.OLD_DEPT_NO_NOT_IN_DEPT_LIST);
+				errorList.add(param);
+				continue;
+			}
 			//保险公司名称
 			String insuranceCompanyName = param.getInsuranceCompanyName();
 			if(StringUtils.isBlank(insuranceCompanyName)){
@@ -3992,14 +4089,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		YifuUser user = SecurityUtils.getUser();
 		//根据当前登录人获取其拥有的项目列表权限
 		// TODO: 2022/8/5
-		//List<String> deptNoList = user.getDeptList();
-		//目前是获取到所有的项目权限
-		List<Dept> deptList = new ArrayList<>();
-		List<String> deptNoList = new ArrayList<>(16);
-		deptNoList.add("皖M02002");
-		deptNoList.add("皖A12345678");
-		deptNoList.add("皖B29203");
-		deptNoList.add("皖M02023");
+		List<String> deptNoList = getDeptNoList(user);
+		List<Dept> deptList = new ArrayList<>(16);
 		R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(deptNoList);
 		if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
 			SetInfoVo data = setInfoByCodes.getData();
@@ -4010,7 +4101,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					deptList.add(new Dept(projectSetInfoVo.getDepartNo(),projectSetInfoVo.getDepartName()));
 				}
 			}
-
 		}
 		return R.ok(deptList,"查询项目列表成功");
 	}
@@ -4069,4 +4159,41 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 
 	}
 
+	public List<String> getDeptNoList(YifuUser user){
+		List<String> deptList = new ArrayList<>(16);
+		String id = user.getId();
+		//周日琴12，徐燕13
+		if (CommonConstants.TWELVE_STRING.equals(id)){
+			deptList.add("A0001");
+			deptList.add("皖M02002");
+			deptList.add("皖A12345678");
+			deptList.add("皖B29203");
+			deptList.add("皖AFA10M");
+			deptList.add("皖AFA11F");
+			deptList.add("皖M02023");
+			deptList.add("皖M02045");
+		} else if(CommonConstants.THIRTEEN_STRING.equals(id)){
+			deptList.add("皖A12345678");
+			deptList.add("皖B29203");
+			deptList.add("皖M02023");
+			deptList.add("皖M02002");
+		}else{
+			deptList.add("A0001");
+			deptList.add("皖M02002");
+			deptList.add("皖A12345678");
+			deptList.add("皖B29203");
+			deptList.add("皖AFA10M");
+			deptList.add("皖AFA11F");
+			deptList.add("皖M02023");
+			deptList.add("皖M02045");
+		}
+		return deptList;
+	}
+
+	public String getRegionSQL(YifuUser user){
+
+		return null;
+	}
+
+
 }

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml

@@ -67,6 +67,7 @@
         CREATE_BY,CREATE_NAME,CREATE_TIME,
         UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID
     </sql>
+	<!--投保办理分页查询-->
 	<select id="getInsuranceListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
 		select detail.id as id,
 		detail.EMP_NAME as empName,
@@ -86,7 +87,13 @@
 		from t_insurance_detail detail
 		where detail.DELETE_FLAG = 0
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
-			and detail.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
+			and detail.DEPT_NO = #{param.deptNo}
+		</if>
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+			and detail.DEPT_NO in
+			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
 		</if>
 		<if test="param.buyHandleStatus != null">
 			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
@@ -98,7 +105,7 @@
 			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
-			and detail.INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
+			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
 		<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
 			and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
@@ -112,6 +119,59 @@
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
+	<!--投保办理分页查询-->
+	<select id="getInsuranceHandleListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
+		select detail.id as id,
+		detail.EMP_NAME as empName,
+		detail.EMP_IDCARD_NO as empIdcardNo,
+		detail.BUY_TYPE as buyType,
+		detail.POST as post,
+		detail.DEPT_NO as deptNo,
+		detail.POLICY_START as policyStart,
+		detail.POLICY_END as policyEnd,
+		detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
+		detail.INSURANCE_TYPE_NAME as insuranceTypeName,
+		detail.BUY_STANDARD as buyStandard,
+		detail.CREATE_NAME as createName,
+		detail.BUY_HANDLE_STATUS as buyHandleStatus,
+		detail.SETTLE_TYPE as settleType,
+		detail.SETTLE_MONTH as settleMonth
+		from t_insurance_detail detail
+		where detail.DELETE_FLAG = 0
+		<if test="param.deptNo != null and param.deptNo.trim() != ''">
+			and detail.DEPT_NO = #{param.deptNo}
+		</if>
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+			and detail.DEPT_NO in
+			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		<if test="param.buyHandleStatus != null">
+			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
+		</if>
+		<if test="param.empName != null and param.empName.trim() != ''">
+			and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.empIdcardNo != null and param.empIdcardNo.trim() != ''">
+			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
+			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
+		</if>
+		<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
+			and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.buyHandleStatusList != null and param.buyHandleStatusList.size > 0">
+			and detail.BUY_HANDLE_STATUS in
+			<foreach collection="param.buyHandleStatusList" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
+	</select>
+
+	<!--投保办理不分页查询-->
 	<select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
 		select detail.id as id,
 		detail.EMP_NAME as empName,
@@ -131,7 +191,13 @@
 		from t_insurance_detail detail
 		where detail.DELETE_FLAG = 0
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
-			and detail.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
+			and detail.DEPT_NO = #{param.deptNo}
+		</if>
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+			and detail.DEPT_NO in
+			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
 		</if>
 		<if test="param.buyHandleStatus != null">
 			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
@@ -143,7 +209,7 @@
 			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
-			and detail.INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
+			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
 		<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
 			and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
@@ -157,6 +223,57 @@
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
+	<!--投保办理不分页查询-->
+	<select id="getInsuranceHandleList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
+		select detail.id as id,
+		detail.EMP_NAME as empName,
+		detail.EMP_IDCARD_NO as empIdcardNo,
+		detail.BUY_TYPE as buyType,
+		detail.POST as post,
+		detail.DEPT_NO as deptNo,
+		detail.POLICY_START as policyStart,
+		detail.POLICY_END as policyEnd,
+		detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
+		detail.INSURANCE_TYPE_NAME as insuranceTypeName,
+		detail.BUY_STANDARD as buyStandard,
+		detail.CREATE_NAME as createName,
+		detail.BUY_HANDLE_STATUS as buyHandleStatus,
+		detail.SETTLE_TYPE as settleType,
+		detail.SETTLE_MONTH as settleMonth
+		from t_insurance_detail detail
+		where detail.DELETE_FLAG = 0
+		<if test="param.deptNo != null and param.deptNo.trim() != ''">
+			and detail.DEPT_NO = #{param.deptNo}
+		</if>
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+			and detail.DEPT_NO in
+			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		<if test="param.buyHandleStatus != null">
+			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
+		</if>
+		<if test="param.empName != null and param.empName.trim() != ''">
+			and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.empIdcardNo != null and param.empIdcardNo.trim() != ''">
+			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
+			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
+		</if>
+		<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
+			and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.buyHandleStatusList != null and param.buyHandleStatusList.size > 0">
+			and detail.BUY_HANDLE_STATUS in
+			<foreach collection="param.buyHandleStatusList" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
+	</select>
 	<select id="getInsuranceDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO">
 		select
 		detail.id as id,
@@ -201,7 +318,7 @@
 		left join t_insurance_settle tis on detail.DEFAULT_SETTLE_ID = tis.ID
 		where detail.ID = #{id}
 	</select>
-
+	<!-- 导出办理勾选查询结果-->
 	<select id="getInsuranceExportListBySelect" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO">
 		select detail.id as id,
 		detail.DEPT_NO as deptNo,
@@ -306,12 +423,12 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-<!--		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
 			and detail.DEPT_NO in
 			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
 				#{item}
 			</foreach>
-		</if>-->
+		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
@@ -393,12 +510,12 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-<!--		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
 			and detail.DEPT_NO in
 			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
 				#{item}
 			</foreach>
-		</if>-->
+		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
@@ -466,12 +583,12 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-<!--		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
 			and detail.DEPT_NO in
 			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
 				#{item}
 			</foreach>
-		</if>-->
+		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
@@ -532,12 +649,12 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-<!--		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
 			and detail.DEPT_NO in
 			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
 				#{item}
 			</foreach>
-		</if>-->
+		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
@@ -596,12 +713,12 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-<!--	<if test="param.deptNo == null or param.deptNo.trim() == ''">
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
 		  and detail.DEPT_NO in
 		  <foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
 			  #{item}
 		  </foreach>
-	  	</if>-->
+	  	</if>
 		<if test="param.reduceHandleStatus != null">
 			and detail.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
 		</if>
@@ -657,12 +774,12 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-		<!--	<if test="param.deptNo == null or param.deptNo.trim() == ''">
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
 		and detail.DEPT_NO in
 		<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
 			#{item}
 		</foreach>
-		</if>-->
+		</if>
 		<if test="param.isOverdue != null ">
 			and detail.IS_OVERDUE = #{param.isOverdue}
 		</if>