Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProcessReq/FormReq.java

@@ -14,6 +14,7 @@ public class FormReq {
     @NotNull(message = "表单名字不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
     private String formName;
 
+    private  String orgId;
     /**
      * 备注信息
      */

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -171,7 +171,11 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
     }
     public PageResult<TemplateGroupVo> getFormList(BaseRequest br)
     {
+        Map<String, Object> params = br.getParams();
         LambdaQueryWrapper<ProcessTemplates> wrapper = new LambdaQueryWrapper<ProcessTemplates>();
+        wrapper.and(q -> q.eq(ProcessTemplates::getOrgId, params.get("orgId"))
+                .or()
+                .isNull(ProcessTemplates::getOrgId));
         wrapper.orderByDesc(ProcessTemplates::getUpdated);
         TemplateGroupMapper templateGroupMapper = SpringContextHolder.getBean(TemplateGroupMapper.class);
         Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage(),wrapper);
@@ -206,6 +210,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                             .formId(v.getTemplateId())
                             .remark(v.getRemark())
                             .formName(v.getFormName())
+                            .orgId(v.getOrgId())
                             .isStop(v.getIsStop())
                             .updated(DateFormatUtils.format(v.getUpdated(),"yyyy年MM月dd日 HH时:mm分:ss秒"))
                             .templateId(v.getTemplateId())
@@ -273,6 +278,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
         ProcessTemplates processTemplates = ProcessTemplates.builder().build();
         String templateId = idWorker.nextId()+"";
+        processTemplates.setOrgId(req.getOrgId());
         processTemplates.setTemplateId(templateId);
         processTemplates.setFormName(req.getFormName());
         processTemplates.setRemark(req.getRemark());

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TemplateGroupVo.java

@@ -20,6 +20,7 @@ public class TemplateGroupVo {
     private String formId;
     private String processDefinitionId;
     private String formName;
+    private String orgId;
     private Boolean isStop;
     private String remark;
     private String updated;