소스 검색

新模型调整

fangpy 6 달 전
부모
커밋
8294eb0ec8
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

+ 1 - 1
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -964,7 +964,7 @@ public class ApsServiceImpl implements ApsService {
                     .eq(ApsProcessOperationProcessEquDo::getProcessid, operationDo.getId()).eq(ApsProcessOperationProcessEquDo::getLockmarkdetail,"y"));
                     .eq(ApsProcessOperationProcessEquDo::getProcessid, operationDo.getId()).eq(ApsProcessOperationProcessEquDo::getLockmarkdetail,"y"));
             if(pros != null && pros.size()>0){
             if(pros != null && pros.size()>0){
                 for (ApsProcessOperationProcessEquDo pro : pros) {
                 for (ApsProcessOperationProcessEquDo pro : pros) {
-                    if(!canchoosedeviceid.contains(pro.getProcessdeviceid())){
+                    if(StrUtil.isNotBlank(pro.getProcessdeviceid()) && !canchoosedeviceid.contains(pro.getProcessdeviceid())){
                         if(StrUtil.isBlank(canchoosedeviceid)){
                         if(StrUtil.isBlank(canchoosedeviceid)){
                             canchoosedeviceid = pro.getProcessdeviceid();
                             canchoosedeviceid = pro.getProcessdeviceid();
                         }else{
                         }else{