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

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