1，代码调整

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRiskSourceDao.java

@@ -24,7 +24,6 @@ public interface IRiskSourceDao extends BaseDao<RiskSource, Long> {
 	
 	Optional<RiskSource> findById(Long id);
 	
-	
 	/**
 	 * 获取厂区下所有区域的rpn值
 	 * 
@@ -41,5 +40,5 @@ public interface IRiskSourceDao extends BaseDao<RiskSource, Long> {
 
 	Optional<RiskSource> findByCode(String riskSourceCode);
 
-	List<RiskSource> findBySourceId(Long instanceId);
+	Optional<RiskSource> findBySourceId(Long instanceId);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -329,16 +329,14 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         list.forEach(r->{
             r.setOrgCode(compCode);
             r.setIsRegion(RiskSourceRegionEum.TRUE.getCode());
-            //TODO 注意：id使用了调用接口方的id,这样代码修改量较小
-            Optional<RiskSource> op = iRiskSourceDao.findById(r.getId());
+            Optional<RiskSource> op = iRiskSourceDao.findBySourceId(r.getId());
             if(op.isPresent()){
                 //有就更新,业务只能调整上级
                 RiskSource riskSource = op.get();
                 riskSource.setParentId(r.getParentId());
                 entrys.add(riskSource);
             } else {
-                //无则插入
-                //TODO 注意：id使用了调用接口方的id,这样代码修改量较小
+                //无则插入,TODO 注意：id使用了调用接口方的id,这样代码修改量较小
                 r.setCreateDate(new Date());
                 r.setIsIndoor(Boolean.FALSE);
                 r.setSourceId(r.getId());
@@ -351,14 +349,13 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     @Override
     public Boolean removeBind(Long instanceId) {
-        List<RiskSource> exists = iRiskSourceDao.findBySourceId(instanceId);
-        if(!CollectionUtils.isEmpty(exists)){
-            exists.forEach(e->{
-                e.setSourceId(null);
-            });
-            exists = iRiskSourceDao.saveAll(exists);
+        Optional<RiskSource> exist = iRiskSourceDao.findBySourceId(instanceId);
+        if(exist.isPresent()){
+            RiskSource riskSource = exist.get();
+            riskSource.setSourceId(null);
+            iRiskSourceDao.save(riskSource);
         }
-        return !CollectionUtils.isEmpty(exists);
+        return exist.isPresent();
     }
 
     /**

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -598,4 +598,13 @@
             alter table `f_risk_source` add column `source_id` bigint(20) DEFAULT NULL AFTER `status`;
         </sql>
     </changeSet>
+    <changeSet author="shg" id="1609226808866-2">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="f_risk_source" columnName="source_id"/>
+        </preConditions>
+        <comment>f_risk_source add UNIQUE source_id</comment>
+        <sql>
+            ALTER TABLE `f_risk_source` ADD UNIQUE unique_idx_source_id(source_id);
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file