feat: mah结算-财务结算校验人员认证信息

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

@@ -730,13 +730,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		// 结算配置信息
 		HnqzUser operator = SecurityUtils.getUser();
 
-		if (SubjectLocation.MAH_SETTLE.equals(wmScorePackage.getLocation())) {
-			// MAH结算的情况-标记
-			input.setMahSettleDeptId(operator.getDeptId());
-		} else {
-			input.setMahSettleDeptId(null);
-		}
-
 		SysDeptSub sysDeptSub = sysDeptSubService.getDeptSub(operator.getDeptId(), location);
 		SysDept sysDept = sysDeptService.getById(sysDeptSub.getDeptId());
 		String taxCode = sysDept.getTaxCode();
@@ -820,18 +813,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1016,18 +1000,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1219,18 +1194,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1417,18 +1383,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1624,18 +1581,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1824,18 +1772,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -2035,18 +1974,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -2240,18 +2170,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -2391,17 +2312,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {