wuxw пре 1 година
родитељ
комит
fc70a759b8

+ 2 - 1
service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java

@@ -23,6 +23,7 @@ import com.java110.po.purchase.PurchaseApplyPo;
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.utils.util.StringUtil;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.model.*;
 import org.activiti.bpmn.model.*;
@@ -479,7 +480,7 @@ public class OaWorkflowActivitiInnerServiceSMOImpl extends BaseServiceSMO implem
         List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
         List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
 
 
         OaWorkflowDataPo oaWorkflowDataPo = null;
         OaWorkflowDataPo oaWorkflowDataPo = null;
-        if (oaWorkflowDataDtos == null || oaWorkflowDataDtos.size() < 1) {
+        if (ListUtil.isNull(oaWorkflowDataDtos)) {
             oaWorkflowDataPo = new OaWorkflowDataPo();
             oaWorkflowDataPo = new OaWorkflowDataPo();
             oaWorkflowDataPo.setBusinessKey(reqJson.getString("id"));
             oaWorkflowDataPo.setBusinessKey(reqJson.getString("id"));
             oaWorkflowDataPo.setFlowId(reqJson.getString("flowId"));
             oaWorkflowDataPo.setFlowId(reqJson.getString("flowId"));

+ 1 - 1
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java

@@ -241,7 +241,7 @@ public class EditOwnerCmd extends Cmd {
         ownerAppUserDto.setMemberId(reqJson.getString("memberId"));
         ownerAppUserDto.setMemberId(reqJson.getString("memberId"));
         //todo 查询app用户表
         //todo 查询app用户表
         List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
         List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-        if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+        if (ListUtil.isNull(ownerAppUserDtos)) {
             return;
             return;
         }
         }
         for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) {
         for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) {