Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java

@@ -26,7 +26,6 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -140,7 +139,7 @@
        if(addList!=null &&addList.size()>0){
            //处理新增
            BaseResponse<OrgOrUserAddResponse> result =  HKService.addBatchOrg(addList);
            if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
            if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
                OrgOrUserAddResponse data = result.getData();
                if(data.getSuccesses()!=null && data.getSuccesses().size()>0){
                    //处理新增成功的数据，修改海康同步状态
@@ -163,7 +162,7 @@
            List<String> error = new ArrayList<>();
            for(OrgEditRequest param : editHkList){
                BaseResponse  result =  HKService.editOrg(param);
                if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
                if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
                    success.add(param.getOrgIndexCode());
                }else{
                    error.add(param.getOrgIndexCode());
@@ -198,7 +197,7 @@
    private OrgAddRequest getOrgAddModel(Company c,String rootOrgId) {
        OrgAddRequest model = new OrgAddRequest();
        model.setOrgIndexCode(HKConstants.RES_ORG_INDEX+UUID.randomUUID().toString().replace("-",""));
        model.setOrgName(c.getName());
        model.setOrgName(c.getName()+HKConstants.RES_ORG_NAME_INDEX);
//        model.setOrgCode(c.getCode());
        model.setParentIndexCode(c.getHkParentId());
        return  model;
@@ -392,7 +391,7 @@
    private String dealMemberFace(Member c,String path) {
        if(StringUtils.isBlank(c.getFaceId())){
            BaseResponse<FaceAddOrEditesponse> response = HKService.addFace(getFaceAddModel(c,path));
            if(StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
            if(response !=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
                return  response.getData().getFaceId();
            }
        }else{