Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/dao/OrgTeamDao.java

 package com.dituhui.pea.order.dao;
 package com.dituhui.pea.order.dao;
 
 
 import com.dituhui.pea.order.entity.OrgTeamEntity;
 import com.dituhui.pea.order.entity.OrgTeamEntity;
+import org.hibernate.annotations.Where;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
+@Where(clause = "status = 1")
 public interface OrgTeamDao extends JpaRepository<OrgTeamEntity, Integer> {
 public interface OrgTeamDao extends JpaRepository<OrgTeamEntity, Integer> {
     List<OrgTeamEntity> findAllByClusterId(String clusterId);
     List<OrgTeamEntity> findAllByClusterId(String clusterId);
 
 

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessTeamServiceImpl.java

@@ -204,9 +204,11 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
             String engineerCode = relation.getEngineerCode();
             String engineerCode = relation.getEngineerCode();
             if (newRelationsMap.containsKey(engineerCode)) {
             if (newRelationsMap.containsKey(engineerCode)) {
                 OrgTeamEngineerEntity newRelation = newRelationsMap.get(engineerCode);
                 OrgTeamEngineerEntity newRelation = newRelationsMap.get(engineerCode);
+                newRelation.setId(relation.getId());
                 newRelation.setUpdateTime(LocalDateTime.now());
                 newRelation.setUpdateTime(LocalDateTime.now());
                 newRelationsMap.put(engineerCode, newRelation);
                 newRelationsMap.put(engineerCode, newRelation);
             } else {
             } else {
+                // 新的关系不再，设置为0(删除)
                 relation.setStatus(0);
                 relation.setStatus(0);
                 orgTeamEngineerDao.save(relation);
                 orgTeamEngineerDao.save(relation);
             }
             }