Merge branch 'MVP1.6.4' into develop

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryStandardOriginalMapper.java

@@ -57,4 +57,7 @@ public interface TSalaryStandardOriginalMapper extends BaseMapper<TSalaryStandar
 	List<TSalaryOriginalExportVo> getTSalaryOriginalExportVoList(@Param("tSalaryStandardOriginal") TSalaryOriginalSearchVo tSalaryStandardOriginal
 			, @Param("idsStr") List<String> idsStr);
 
+	int exportListCount(@Param("tSalaryStandardOriginal") TSalaryOriginalSearchVo tSalaryStandardOriginal
+			, @Param("idsStr") List<String> idsStr);
+
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java

@@ -20,9 +20,7 @@ import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.monitorjbl.xlsx.StreamingReader;
@@ -97,6 +95,11 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 		return baseMapper.getTSalaryOriginalExportVoList(searchVo, idList);
 	}
 
+	private int exportListCount(TSalaryOriginalSearchVo searchVo) {
+		List<String> idList = Common.getList(searchVo.getIds());
+		return baseMapper.exportListCount(searchVo, idList);
+	}
+
 	/**
 	 * @Description: 分页查询
 	 * @Author: hgw
@@ -1042,7 +1045,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 		String fileName = "薪资原表配置导出" + DateUtil.getThisTime() + ".xlsx";
 		//获取要导出的列表
 		List<TSalaryOriginalExportVo> list = new ArrayList<>();
-		long count = noPageCountDiy(searchVo);
+		long count = exportListCount(searchVo);
 		ServletOutputStream out = null;
 		try {
 			out = response.getOutputStream();
@@ -1087,21 +1090,4 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 		}
 	}
 
-	private Long noPageCountDiy(TSalaryOriginalSearchVo searchVo) {
-		LambdaQueryWrapper<TSalaryStandardOriginal> wrapper = buildQueryWrapper(searchVo);
-		List<String> idList = Common.getList(searchVo.getIds());
-		if (Common.isNotNull(idList)) {
-			wrapper.in(TSalaryStandardOriginal::getId, idList);
-		}
-		return baseMapper.selectCount(wrapper);
-	}
-
-	private LambdaQueryWrapper buildQueryWrapper(TSalaryOriginalSearchVo entity) {
-		LambdaQueryWrapper<TSalaryOriginalSearchVo> wrapper = Wrappers.lambdaQuery(entity);
-		if (Common.isNotNull(entity.getCreateName())) {
-			wrapper.like(TSalaryOriginalSearchVo::getCreateName, entity.getCreateName());
-		}
-		return wrapper;
-	}
-
 }

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

@@ -123,6 +123,22 @@
 		ORDER BY a.CREATE_TIME desc
 	</select>
 
+	<select id="exportListCount" resultType="java.lang.Integer">
+		SELECT
+			count(1)
+		FROM
+			t_salary_standard_original a
+		<where> a.DELETE_FLAG = 0
+			<if test="idsStr != null and idsStr.size > 0">
+				AND a.ID in
+				<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
+					#{items}
+				</foreach>
+			</if>
+			<include refid="TSalaryStandardOriginal_where"/>
+		</where>
+	</select>
+
 	<select id="getTSalaryOriginalExportVoList" resultMap="TSalaryOriginalExportMap">
 		SELECT
 			a.DEPT_NO,a.DEPT_NAME,a.SET_NAME,a.CREATE_NAME,a.CREATE_TIME

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -24,6 +24,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.ErrorDetailVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
@@ -615,7 +616,7 @@ public class TPaymentInfoController {
 	@Operation(description = "税务社保明细导入")
 	@SysLog("税务社保明细导入")
 	@PostMapping("/importTaxSocialInfoList")
-	public R<List<ErrorDetailVO>> importTaxSocialInfoList(@RequestBody MultipartFile file) {
+	public R<List<ErrorMessage>> importTaxSocialInfoList(@RequestBody MultipartFile file) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(user)){
 			return R.failed(CommonConstants.USER_FAIL);

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java

@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;/*
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.ErrorDetailVO;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
@@ -79,7 +80,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 * @param inputStream
 	 * @return
 	 */
-	R<List<ErrorDetailVO>> importTaxSocialInfoDiy(InputStream inputStream);
+	R<List<ErrorMessage>> importTaxSocialInfoDiy(InputStream inputStream);
 
 	/**
 	 * 批量导入公积金

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java

@@ -794,6 +794,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			personVo.setPersonName(updateJson.get("cn")==null?"":updateJson.getString("cn"));
 			personVo.setTelephoneNumber(updateJson.get("telephoneNumber")==null?"":updateJson.getString("telephoneNumber"));
 			personVo.setEmail(updateJson.get("mail")==null?"":updateJson.getString("mail"));
+			personVo.setRoleIds(updateJson.get("x-init-role-ids")==null?"":updateJson.getString("x-init-role-ids"));
 			String dn = updateJson.get("dn")==null?"":updateJson.getString("dn");
 			log.info("更新人员信息：" + dn + "_" +personVo.getUid());
 			if (dn.contains("uid")) {

yifu-upms/yifu-upms-biz/src/main/resources/application.yml

@@ -39,6 +39,7 @@ security:
         - /actuator/**
         - /swagger-ui/**
         - /role/getRoleList
+        - /user/updateUserAndDept