Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaDocumentServiceImpl.java

@@ -49,17 +49,13 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
         Integer tenantId = SecurityUtils.getTenantId();
 
         LambdaQueryWrapper<OaDocument> wrapper = Wrappers.lambdaQuery();
-        wrapper.like(StringUtils.isNotBlank(docNo), OaDocument::getDocNo, docNo)
+        wrapper.eq(OaDocument::getTenantId, tenantId).eq(OaDocument::getProposer, userId)
+                .like(StringUtils.isNotBlank(docNo), OaDocument::getDocNo, docNo)
                 .eq(StringUtils.isNotBlank(type), OaDocument::getType, type)
                 .eq(status != null, OaDocument::getStatus, status)
-                .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), OaDocument::getCreateTime, startTime, endTime);
-        List<OaDocument> oaDocuments = oaDocumentMapper.selectList(wrapper);
-        if (oaDocuments.isEmpty()) {
-            return null;
-        } else {
-            wrapper.eq(OaDocument::getTenantId, tenantId).eq(OaDocument::getProposer, userId).orderByDesc(OaDocument::getId);
-            ;
-        }
+                .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), OaDocument::getCreateTime, startTime, endTime)
+                .orderByDesc(OaDocument::getId);
+
         return ToCommonPage(page(new Page<>(pageNum, pageSize), wrapper));
     }
 

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaFormDefinitionServiceImpl.java

@@ -203,7 +203,7 @@ public class OaFormDefinitionServiceImpl extends AbstractCrudService<OaFormDefin
     public List<OaFormNameResponseVO> getFormName() {
         LambdaQueryWrapper<OaFormDefinition> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(OaFormDefinition::getTenantId, SecurityUtils.getTenantId())
-                .select(OaFormDefinition::getId, OaFormDefinition::getFormName);
+                .select(OaFormDefinition::getId, OaFormDefinition::getFormName, OaFormDefinition::getFormSign);
         List<OaFormDefinition> oaFormDefinitions = oaFormDefinitionMapper.selectList(queryWrapper);
 
         List<OaFormNameResponseVO> formNameList = new ArrayList<>();
@@ -211,6 +211,7 @@ public class OaFormDefinitionServiceImpl extends AbstractCrudService<OaFormDefin
             OaFormNameResponseVO oaFormNameResponseVO = new OaFormNameResponseVO();
             oaFormNameResponseVO.setFormId(oaFormDefinition.getId());
             oaFormNameResponseVO.setFormName(oaFormDefinition.getFormName());
+            oaFormNameResponseVO.setFormSign(oaFormDefinition.getFormSign());
             formNameList.add(oaFormNameResponseVO);
         }
         return formNameList;

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/vo/OaFormNameResponseVO.java

@@ -13,6 +13,10 @@ public class OaFormNameResponseVO {
 
     /** 表单id */
     private Integer formId;
+
+    /** 表单标识 */
+    private String formSign;
+
     /** 表单名 */
     private String formName;