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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java

@@ -511,5 +511,14 @@ public class TSettleDomain extends BaseEntity {
 	@ExcelIgnore
 	@TableField(exist = false)
 	private String serviceTeam;
-
+	/**
+	 * 条线类型
+	 */
+	@Schema(description = "条线类型")
+	private String lineType;
+	/**
+	 * BU归属
+	 */
+	@Schema(description = "BU归属")
+	private String buBelong;
 }

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainEkpVo.java

 package com.yifu.cloud.plus.v1.yifu.archives.vo;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.HeadFontStyle;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.DecimalMax;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -440,4 +430,15 @@ public class TSettleDomainEkpVo  implements Serializable {
 	 */
 	@Schema(description = "EKP的服务团队", name = "serviceTeam")
 	private String serviceTeam;
+
+	/**
+	 * 条线类型
+	 */
+	@Schema(description = "条线类型")
+	private String lineType;
+	/**
+	 * BU归属
+	 */
+	@Schema(description = "BU归属")
+	private String buBelong;
 }

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

@@ -17,6 +17,7 @@
 package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -98,13 +99,15 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 				redisUtil.remove(CacheConstants.WXHR_SETTLE_DOMAIN_NOS_BY_USERID +"_"+userId);
 				redisUtil.remove(CacheConstants.DATA_AUTH_DETAILS +"_0");
 				redisUtil.remove(CacheConstants.DATA_AUTH_DETAILS +"_1");
-				// 清空userinfo
-				Objects.requireNonNull(cacheManager.getCache(CacheConstants.USER_DETAILS)).clear();
+				if (Common.isNotNull(user)){
 					redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ user.getUsername());
 					if( Common.isNotNull(user.getPhone())){
 						redisUtil.remove(CacheConstants.USER_DETAILS + "_phone::"+ user.getPhone());
 					}
 				}
+				// 清空userinfo
+				Objects.requireNonNull(cacheManager.getCache(CacheConstants.USER_DETAILS)).clear();
+			}
 		} catch (Exception e) {
 			log.error("清除缓存错误：",e);
 		}
@@ -210,6 +213,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 				// 处理服务团队数据权限 2022-09-19 fxj
 				initServerTeamPermission(domain);
 				domain.setDeleteFlag(CommonConstants.ZERO_STRING);
+				log.error(JSON.toJSONString(vo));
 				if (Common.isNotNull(tSettleDomainInfo)) {
 					baseMapper.updateById(domain);
 				} else {

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

@@ -90,6 +90,8 @@
 		<result property="riskServerItem" column="RISK_SERVER_ITEM"/>
 		<result property="unitSeriousIllnessProp" column="UNIT_SERIOUS_ILLNESS_PROP"/>
 		<result property="bpoFlag" column="BPO_FLAG"/>
+		<result property="buBelong" column="BU_BELONG"/>
+		<result property="lineType" column="LINE_TYPE"/>
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -163,7 +165,9 @@
 		a.MANAGE_SERVER_ITEM,
 		a.RISK_SERVER_ITEM,
 		a.UNIT_SERIOUS_ILLNESS_PROP,
-		a.BPO_FLAG
+		a.BPO_FLAG,
+		a.BU_BELONG,
+		a.LINE_TYPE
 	</sql>
 
 	<resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">