Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java

@@ -35,6 +35,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpChangeInfoNewVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpChangeInfoVO;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -341,9 +342,35 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 	public IPage<TSettleDomain> getAllDeptPagePermission(Page page, String departName, String nameOrNo, String customerId,String flag) {
 		YifuUser user = SecurityUtils.getUser();
 		String userId=user.getId();
+		// SSC开发组-1668092146875969537L  超管1
+		long roleId = 1668092146875969537L;
+		boolean isSsc =	this.haveRole(user, roleId);
+		if (!isSsc) {
+			isSsc =	this.haveRole(user, 1L);
+		}
+		if (isSsc) {
+			userId = "-999";
+		}
 		return tSettleDomainMapper.getPagePerMission(page, userId, departName, nameOrNo, customerId, flag);
 
 	}
+
+	/**
+	 * @Description:  检测是否有某个角色权限
+	 * @Author: hgw
+	 * @Date: 2023/6/12 11:09
+	 * @return: boolean
+	 **/
+	private boolean haveRole(YifuUser user, long roleId) {
+		List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
+		for (Long role : roleList) {
+			if (role == roleId) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * 分页获取所有项目名称
 	 * @return R

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -271,10 +271,14 @@
 		<include refid="Base_Column_List"/>
 		FROM
 			t_settle_domain a
+			<if test="userId != null and userId.trim() != '-999'">
 				LEFT JOIN t_cutsomer_data_permisson b ON b.SETTLE_DOMAIN_NO = a.DEPART_NO
-		WHERE
-			 b.USER_ID = #{userId}
-		  AND a.DELETE_FLAG = '0'
+			</if>
+		WHERE a.DELETE_FLAG = '0'
+		/* 2023-6-12 11:12:15 hgw根据 */
+		<if test="userId != null and userId.trim() != '-999'">
+			AND b.USER_ID = #{userId}
+		</if>
 		<if test="departName != null and departName.trim() != ''">
 			and a.DEPART_NAME like concat("%",#{departName},"%")
 		</if>
@@ -287,9 +291,7 @@
 		<if test="flag != null">
 			and a.STOP_FLAG='0'
 		</if>
-		GROUP BY
-			b.USER_ID,
-			b.SETTLE_DOMAIN_NO
+		GROUP BY a.id
 	</select>
 
 

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -225,7 +225,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					.eq(TOrderEnclosure::getDeleteFlag, CommonConstants.ZERO_INT)
 			);
 			if (CollectionUtils.isNotEmpty(list)) {
-				List<TOrderEnclosure> listOld = list.stream().filter(e -> CommonConstants.ZERO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
+				List<TOrderEnclosure> fileList = list.stream().filter(e -> CommonConstants.ZERO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> wageList = list.stream().filter(e -> CommonConstants.TWO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> salaryList = list.stream().filter(e -> CommonConstants.THREE_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> socialList = list.stream().filter(e -> CommonConstants.FOUR_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
@@ -237,8 +237,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 				List<TOrderEnclosure> otherList = list.stream().filter(e -> CommonConstants.TEN_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> salaryHandoverList = list.stream().filter(e -> CommonConstants.ELEVEN_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 
-				if (CollectionUtils.isNotEmpty(listOld)) {
-					orderDetailVO.setOrderEnclosure(listOld);
+				if (CollectionUtils.isNotEmpty(fileList)) {
+					orderDetailVO.setOrderEnclosure(fileList);
 				} else {
 					orderDetailVO.setOrderEnclosure(Lists.newArrayList());
 				}
@@ -508,7 +508,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		if (!Common.isEmpty(vo.getOrderContent()) && !ValidityUtil.validate2048(vo.getOrderContent())){
 			return R.failed(OrderConstants.ORDER_CONTENT_MORE_THAN_2048);
 		}
-			TSettleDomain settleDomain = new TSettleDomain();
+		if (CollectionUtils.isEmpty(vo.getHandleUserList())){
+			return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
+		}		TSettleDomain settleDomain = new TSettleDomain();
 
 		List<TSettleDomainSelectVo> settleDomainR;
 		R<TSettleDomainListVo> listVo;

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TMinSalaryMapper.xml

@@ -117,7 +117,7 @@
 						</if>
 					</if>
 				</if>
-				<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''">
+				<if test="tMinSalary.town != null">
 					AND TOWN = '${tMinSalary.town}'
 				</if>
 			</if>
@@ -184,20 +184,20 @@
 						</if>
 					</if>
 				</if>
-				<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''">
+				<if test="tMinSalary.town != null ">
 					AND (TOWN = '${tMinSalary.town}' = '${tMinSalary.town}')
 				</if>
 			</if>
 			<if test='tMinSalary.areaFlag == "0"'>
-				<if test="tMinSalary.province != null and tMinSalary.province.trim() != '' and tMinSalary.city == null">
+				<if test="tMinSalary.province != null and tMinSalary.city == null">
 					AND (
 					(PROVINCE = '${tMinSalary.province}' and (a.CITY is null or a.CITY =''))
 				</if>
-				<if test="tMinSalary.city != null and tMinSalary.city.trim() != '' and tMinSalary.town == null">
+				<if test="tMinSalary.city != null and tMinSalary.town == null">
 					AND (
 					(CITY = '${tMinSalary.city}'  and (TOWN is null  or TOWN =''))
 				</if>
-				<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''">
+				<if test="tMinSalary.town != null ">
 					AND (TOWN = '${tMinSalary.town}' or TOWN = '${tMinSalary.town}')
 				</if>
 			</if>