Merge branch 'develop' into MVP1.7.1

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

@@ -184,6 +184,7 @@ public class TPreEmployeeInfo extends BaseEntity {
 	@ExcelAttribute(name = "身份证-省")
 	@ExcelProperty("身份证-省")
 	@Schema(description = "身份证-省")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Integer idProvince;
 	/**
 	 * 身份证-市
@@ -191,6 +192,7 @@ public class TPreEmployeeInfo extends BaseEntity {
 	@ExcelAttribute(name = "身份证-市")
 	@ExcelProperty("身份证-市")
 	@Schema(description = "身份证-市")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Integer idCity;
 	/**
 	 * 身份证-县
@@ -198,6 +200,7 @@ public class TPreEmployeeInfo extends BaseEntity {
 	@ExcelAttribute(name = "身份证-县")
 	@ExcelProperty("身份证-县")
 	@Schema(description = "身份证-县")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Integer idTown;
 	/**
 	 * 户口性质

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

@@ -3422,14 +3422,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 							tPreEmployeeInfo.setPoliticalStatus(info.getPoliticalStatusValue());
 							tPreEmployeeInfo.setEmpEmail(info.getEmpEmail());
 							tPreEmployeeInfo.setEmpPhone(info.getEmpPhone());
+							// 2024-10-30 20:02:53 测试jld认为如果没写户籍省，则带出档案。我认为有道理
 							if (Common.isNotNull(info.getIdProvinceValue())) {
 								tPreEmployeeInfo.setIdProvince(Integer.parseInt(info.getIdProvinceValue()));
-							}
-							if (Common.isNotNull(info.getIdCityValue())) {
-								tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue()));
-							}
-							if (Common.isNotNull(info.getIdTownValue())) {
-								tPreEmployeeInfo.setIdTown(Integer.parseInt(info.getIdTownValue()));
+								if (Common.isNotNull(info.getIdCityValue())) {
+									tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue()));
+								} else {
+									tPreEmployeeInfo.setIdCity(null);
+								}
+								if (Common.isNotNull(info.getIdTownValue())) {
+									tPreEmployeeInfo.setIdTown(Integer.parseInt(info.getIdTownValue()));
+								} else {
+									tPreEmployeeInfo.setIdTown(null);
+								}
 							}
 							tPreEmployeeInfo.setEmpRegisType(info.getEmpRegisTypeValue());
 							if (Common.isNotNull(info.getFileProvinceValue())) {
@@ -3440,6 +3445,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 							}
 							if (Common.isNotNull(info.getFileTownValue())) {
 								tPreEmployeeInfo.setFileTown(Integer.parseInt(info.getFileTownValue()));
+							} else {
+								tPreEmployeeInfo.setFileTown(null);
 							}
 							if (Common.isNotNull(info.getEducationNameValue())) {
 								tPreEmployeeInfo.setHignEducation(info.getEducationNameValue());

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -19,6 +19,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
+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.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException;
@@ -7684,7 +7685,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	@Override
 	public IPage<TBusinessInsuranceVo> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, InsuranceSearchVo condition) {
 		YifuUser user = SecurityUtils.getUser();
-		if ("许瑞玲".equals(user.getNickname()) || "1".equals(user.getId())) {
+		long roleId = 1851541100126863362L;
+		boolean isSsc =	this.haveRole(user, roleId);
+		if ("许瑞玲".equals(user.getNickname()) || "1".equals(user.getId()) || isSsc) {
 			condition.setCreateBy(null);
 		} else {
 			condition.setCreateBy(user.getId());
@@ -7933,7 +7936,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			searchVo.setIdList(Common.getList(idstr));
 		}
 		YifuUser user = SecurityUtils.getUser();
-		if ("许瑞玲".equals(user.getNickname()) || "1".equals(user.getId())) {
+		long roleId = 1851541100126863362L;
+		boolean isSsc =	this.haveRole(user, roleId);
+		if ("许瑞玲".equals(user.getNickname()) || "1".equals(user.getId()) || isSsc) {
 			searchVo.setCreateBy(null);
 		} else {
 			searchVo.setCreateBy(user.getId());
@@ -8050,4 +8055,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		searchVo.setExpireIgnoreFlag(CommonConstants.ONE_STRING);
 		return R.ok(baseMapper.noPageCountDiy(searchVo));
 	}
+
+	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;
+	}
 }