fix: 创建企业时,默认服务截止时间一年后

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

@@ -1078,7 +1078,9 @@ public class SysUserController {
 			// 上级csm
 			List<SysCsmUserRelation> csmUserRelations = sysCsmUserRelationMapper.selectList(Wrappers.<SysCsmUserRelation>lambdaQuery()
 					.in(SysCsmUserRelation::getUserId, userIds));
-			csmParentUserMap.putAll(csmUserRelations.stream().collect(Collectors.groupingBy(SysCsmUserRelation::getUserId)));
+			if (CollUtil.isNotEmpty(csmUserRelations)) {
+				csmParentUserMap.putAll(csmUserRelations.stream().collect(Collectors.groupingBy(SysCsmUserRelation::getUserId)));
+			}
 		}
 
 		userVosPage.getRecords().forEach(userVO -> {

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

@@ -1217,29 +1217,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return page1;
 	}
 
-
-	/**
-	 * 递归查询CSM所有下级的用户ID
-	 *
-	 * @param allIds     所有ID
-	 * @param parentIds  父级ID
-	 * @param limitCount 递归次数限制
-	 */
-	private void recurseCsmLowerUserId(Set<Integer> allIds, Set<Integer> parentIds, AtomicInteger limitCount) {
-		// 限制调用次数
-		if (limitCount.decrementAndGet() <= 0) {
-			return;
-		}
-
-		List<SysCsmUserRelation> csmUserRelations = sysCsmUserRelationService.list(Wrappers.<SysCsmUserRelation>lambdaQuery()
-				.in(SysCsmUserRelation::getParentId, parentIds));
-		if (CollUtil.isNotEmpty(csmUserRelations)) {
-			Set<Integer> userIds = csmUserRelations.stream().map(SysCsmUserRelation::getUserId).collect(Collectors.toSet());
-			this.recurseCsmLowerUserId(allIds, userIds, limitCount);
-			allIds.addAll(userIds);
-		}
-	}
-
 	/**
 	 * 通过ID查询用户信息
 	 *

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

@@ -127,6 +127,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 	*/
 	public boolean saveAgent(WmDaAgent wmDaAgent) {
 		Integer deptId = SecurityUtils.getUser().getDeptId();
+		SysDept queryDept = sysDeptMapper.selectById(deptId);
 
 		wmDaAgent.setCreateTime(LocalDateTime.now());
 		boolean isSave = super.save(wmDaAgent);
@@ -139,6 +140,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 					sysDept.setTaxCode(wmDaAgent.getZjNumber());
 					sysDept.setSubjectType(wmDaAgent.getSubjectType());
 					sysDept.setLevel(3);
+					sysDept.setExpiryDate(queryDept.getExpiryDate());
 					sysDeptService.save(sysDept);
 					wmDaAgent.setDeptId(String.valueOf(sysDept.getDeptId()));
 					wmDaAgentMapper.updateById(wmDaAgent);
@@ -169,6 +171,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 					sysDept.setLevel(4);
 					sysDept.setTaxCode(wmDaAgent.getZjNumber());
 					sysDept.setSubjectType(wmDaAgent.getSubjectType());
+					sysDept.setExpiryDate(queryDept.getExpiryDate());
 					sysDeptService.save(sysDept);
 					wmDaAgent.setDeptId(String.valueOf(sysDept.getDeptId()));
 					wmDaAgentMapper.updateById(wmDaAgent);
@@ -302,6 +305,8 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R insert(WmDaAgent wmDaAgent) {
+		LocalDateTime now = LocalDateTime.now();
+
 		WmDaAgent query = new WmDaAgent();
 		query.setGsmc(wmDaAgent.getGsmc());
 		List<WmDaAgent> list1 = wmDaAgentMapper.selectList(Wrappers.query(query));
@@ -331,7 +336,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 			temp1 = temp1.substring(0, temp1.length() - 1);
 		}
 		wmDaAgent.setTemp1(temp1);
-		wmDaAgent.setCreateTime(LocalDateTime.now());
+		wmDaAgent.setCreateTime(now);
 		wmDaAgent.setCreateUser(SecurityUtils.getUser().getId());
 		wmDaAgent.setManagement(String.valueOf(1));
 		wmDaAgent.setPgqx(1 + "");
@@ -350,6 +355,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 			sysDept.setSubjectType(wmDaAgent.getSubjectType());
 			sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
 			sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
+			sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
 			if (wmDaAgent.getQylx().contains("0")) {
 				sysDept.setName(wmDaAgent.getGsmc());
 				sysDept.setLevel(3);

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

@@ -140,8 +140,10 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	@Override
 	public boolean saveDrugEnts(WmDaDrugEnt entity) {
 
+		LocalDateTime now = LocalDateTime.now();
+
 		entity.setDeptId(String.valueOf(System.currentTimeMillis() / 1000));
-		entity.setCreateTime(LocalDateTime.now());
+		entity.setCreateTime(now);
 		entity.setCreateUser(SecurityUtils.getUser().getId());
 
 		if (super.save(entity)) {
@@ -151,6 +153,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			sysDept.setSubjectType(entity.getSubjectType());
 			sysDept.setDeptPermissions(entity.getDeptPermissions());
 			sysDept.setFinancialReviewType(entity.getFinancialReviewType());
+			sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
 			sysDeptService.save(sysDept);
 			entity.setDeptId(String.valueOf(sysDept.getDeptId()));
 			wmDaDrugEntMapper.updateById(entity);