Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/ESignServiceImpl.java

@@ -700,6 +700,8 @@ public class ESignServiceImpl implements IESignService {
 
     @Override
     public IPage<ContractSignVO> queryUserSignContractList(ContractSignDTO contractSignDTO) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        contractSignDTO.setOrgCode(loginUser.getOrgCode());
         Page<ContractSignVO> page = new Page<>(contractSignDTO.getPageNo(), contractSignDTO.getPageSize());
         return appContractSignMapper.queryUserSignContractList(page,contractSignDTO);
     }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/ContractSignDTO.java

@@ -31,6 +31,7 @@ public class ContractSignDTO{
 
     @Schema(description = "联系电话")
     private String phone;
+    private String OrgCode;
     @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "创建时间（合同签约记录创建时间）")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppContractSignMapper.xml

@@ -21,7 +21,7 @@
         GROUP BY order_id
         ) o ON a.order_id = o.order_id
         <where>
-            1=1
+            1=1 AND a.org_code LIKE CONCAT(#{contractSignDTO.orgCode}, '%')
             <!-- 家庭成员姓名模糊查询 -->
             <if test="contractSignDTO.fullName != null and contractSignDTO.fullName != ''">
                 AND c.full_name LIKE CONCAT('%', #{contractSignDTO.fullName}, '%')