Compare commits

..

No commits in common. "04285b4a52b8c525ebf174a14ae3a1eb56e42f11" and "c6310875116960babf5d27252ecb1414b5757025" have entirely different histories.

5 changed files with 0 additions and 33 deletions

View File

@ -63,6 +63,3 @@ dahua:
password: qinan@202604
clientId: mkmj_management
clientSecret: 5ef82f7c-9926-46a3-8d07-136fd054849c
nine:
config:
companyId: 2008712261453131776

View File

@ -64,6 +64,3 @@ dahua:
password: qinan@202604
clientId: mkmj_management
clientSecret: 5ef82f7c-9926-46a3-8d07-136fd054849c
nine:
config:
companyId: 2590800828822460065

View File

@ -14,7 +14,6 @@ import com.jjb.saas.system.client.user.facade.UserFacade;
import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor;
import com.zcloud.basic.info.command.convertor.UserCoConvertor;
import com.zcloud.basic.info.constant.RedisConstant;
import com.zcloud.basic.info.domain.config.NineCompanyConfig;
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
import com.zcloud.basic.info.domain.enums.UserTypeEnum;
import com.zcloud.basic.info.domain.gateway.UserGateway;
@ -33,7 +32,6 @@ import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Tools;
import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@ -51,7 +49,6 @@ import java.util.stream.Collectors;
*/
@Component
@AllArgsConstructor
@Slf4j
public class UserQueryExe {
private final UserRepository userRepository;
private final UserGateway userGateway;
@ -60,7 +57,6 @@ public class UserQueryExe {
private final CorpInfoCoConvertor corpInfoCoConvertor;
private ZcloudRedisUtil zcloudRedisUtil;
private final UserExpandInfoRepository userExpandInfoRepository;
private final NineCompanyConfig nineCompanyConfig;
/**
@ -240,14 +236,6 @@ public class UserQueryExe {
UserDO userDO = userRepository.getInfoById(id);
UserCO userCO = new UserCO();
BeanUtils.copyProperties(userDO, userCO);
try{
Long nineCompanyId = nineCompanyConfig.getCompanyId();
userCO.setNineCompanyFlag(nineCompanyId != null && nineCompanyId.equals(userCO.getCorpinfoId()));
}catch (Exception e){
log.error("获取九公司ID异常", e);
e.printStackTrace();
}
return SingleResponse.of(userCO);
}

View File

@ -218,8 +218,5 @@ public class UserCO extends ClientObject {
private String payNumber;
@ApiModelProperty(value = "是否缴纳其他人身伤害保险")
private Integer isBf;
@ApiModelProperty(value = "是否九公司人员")
private Boolean nineCompanyFlag;
}

View File

@ -1,12 +0,0 @@
package com.zcloud.basic.info.domain.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Component
@ConfigurationProperties(prefix = "nine.config")
@Data
public class NineCompanyConfig {
private Long companyId;
}