Skip to content

Y
yifu-mvp
Commit 63dc7349 authored by huyuchen's avatar huyuchen
Browse files
Options

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

parents 31ad81c7 01ca4e16
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 138 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @ 63dc7349
...@@ -35,6 +35,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService; ...@@ -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.service.TEmployeeProjectService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpChangeInfoNewVO; 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.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.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes; import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...@@ -341,9 +342,35 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -341,9 +342,35 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
public IPage<TSettleDomain> getAllDeptPagePermission(Page page, String departName, String nameOrNo, String customerId,String flag) { public IPage<TSettleDomain> getAllDeptPagePermission(Page page, String departName, String nameOrNo, String customerId,String flag) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
String userId=user.getId(); 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); 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 * @return R
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @ 63dc7349
...@@ -271,10 +271,14 @@ ...@@ -271,10 +271,14 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM FROM
t_settle_domain a 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 LEFT JOIN t_cutsomer_data_permisson b ON b.SETTLE_DOMAIN_NO = a.DEPART_NO
WHERE </if>
b.USER_ID = #{userId} WHERE a.DELETE_FLAG = '0'
AND 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() != ''"> <if test="departName != null and departName.trim() != ''">
and a.DEPART_NAME like concat("%",#{departName},"%") and a.DEPART_NAME like concat("%",#{departName},"%")
</if> </if>
...@@ -287,9 +291,7 @@ ...@@ -287,9 +291,7 @@
<if test="flag != null"> <if test="flag != null">
and a.STOP_FLAG='0' and a.STOP_FLAG='0'
</if> </if>
GROUP BY GROUP BY a.id
b.USER_ID,
b.SETTLE_DOMAIN_NO
</select> </select>
......
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @ 63dc7349
...@@ -225,7 +225,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme ...@@ -225,7 +225,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
.eq(TOrderEnclosure::getDeleteFlag, CommonConstants.ZERO_INT) .eq(TOrderEnclosure::getDeleteFlag, CommonConstants.ZERO_INT)
); );
if (CollectionUtils.isNotEmpty(list)) { 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> 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> 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()); 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 ...@@ -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> 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()); List<TOrderEnclosure> salaryHandoverList = list.stream().filter(e -> CommonConstants.ELEVEN_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(listOld)) { if (CollectionUtils.isNotEmpty(fileList)) {
orderDetailVO.setOrderEnclosure(listOld); orderDetailVO.setOrderEnclosure(fileList);
} else { } else {
orderDetailVO.setOrderEnclosure(Lists.newArrayList()); orderDetailVO.setOrderEnclosure(Lists.newArrayList());
} }
...@@ -508,7 +508,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme ...@@ -508,7 +508,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if (!Common.isEmpty(vo.getOrderContent()) && !ValidityUtil.validate2048(vo.getOrderContent())){ if (!Common.isEmpty(vo.getOrderContent()) && !ValidityUtil.validate2048(vo.getOrderContent())){
return R.failed(OrderConstants.ORDER_CONTENT_MORE_THAN_2048); 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; List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo; R<TSettleDomainListVo> listVo;
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TMinSalaryMapper.xml
View file @ 63dc7349
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</if> </if>
</if> </if>
</if> </if>
<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''"> <if test="tMinSalary.town != null">
AND TOWN = '${tMinSalary.town}' AND TOWN = '${tMinSalary.town}'
</if> </if>
</if> </if>
...@@ -184,20 +184,20 @@ ...@@ -184,20 +184,20 @@
</if> </if>
</if> </if>
</if> </if>
<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''"> <if test="tMinSalary.town != null ">
AND (TOWN = '${tMinSalary.town}' = '${tMinSalary.town}') AND (TOWN = '${tMinSalary.town}' = '${tMinSalary.town}')
</if> </if>
</if> </if>
<if test='tMinSalary.areaFlag == "0"'> <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 ( AND (
(PROVINCE = '${tMinSalary.province}' and (a.CITY is null or a.CITY ='')) (PROVINCE = '${tMinSalary.province}' and (a.CITY is null or a.CITY =''))
</if> </if>
<if test="tMinSalary.city != null and tMinSalary.city.trim() != '' and tMinSalary.town == null"> <if test="tMinSalary.city != null and tMinSalary.town == null">
AND ( AND (
(CITY = '${tMinSalary.city}' and (TOWN is null or TOWN ='')) (CITY = '${tMinSalary.city}' and (TOWN is null or TOWN =''))
</if> </if>
<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''"> <if test="tMinSalary.town != null ">
AND (TOWN = '${tMinSalary.town}' or TOWN = '${tMinSalary.town}') AND (TOWN = '${tMinSalary.town}' or TOWN = '${tMinSalary.town}')
</if> </if>
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment