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

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;
+	}
 }