|
@@ -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{
|