Переглянути джерело

新增根据crmNo查询在途的sop信息

wangliang 1 рік тому
батько
коміт
77d946d63f

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -278,7 +278,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
     public IPage<Map> list(SopInfoListParam sopInfoListParam) {
 //        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 //        List<Long> userIdList = !CollectionUtils.isEmpty(sopInfoListParam.getUserIdList()) ? sopInfoListParam.getUserIdList() : Arrays.asList(sysUser.getId());
-        if (sopInfoListParam.getType() != TFCustomTypeEnum.OFFICE_SOP_FLOW || sopInfoListParam.getType() != TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {
+        if (sopInfoListParam.getType() != TFCustomTypeEnum.OFFICE_SOP_FLOW && sopInfoListParam.getType() != TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {
             throw ExceptionResultEnum.ERROR.exception("流程类型只能为教务处或研究生");
         }
         String fieldName = null, fieldValue = null;

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/service/impl/TDFormWidgetMetadataServiceImpl.java

@@ -75,7 +75,7 @@ public class TDFormWidgetMetadataServiceImpl extends ServiceImpl<TDFormWidgetMet
      */
     @Override
     public List<TDFormWidgetMetadata> selectAll(TFCustomTypeEnum type, Integer version) {
-        if (type != TFCustomTypeEnum.OFFICE_SOP_FLOW || type != TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {
+        if (type != TFCustomTypeEnum.OFFICE_SOP_FLOW && type != TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {
             throw ExceptionResultEnum.ERROR.exception("流程类型只能为教务处或研究生");
         }
         return this.list(new QueryWrapper<TDFormWidgetMetadata>().lambda().eq(TDFormWidgetMetadata::getType, type).eq(TDFormWidgetMetadata::getVersion, version).orderByAsc(TDFormWidgetMetadata::getSetup));