Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -806,6 +806,8 @@ public class CommConstant {
      */
     public static final String AUTO_AUTH_STATUS = "3000";
 
+    public static final String AUTO_UNAUTH_STATUS = "3001";
+
     public static final String  AUTH_SUCCESS_DESC = "签章成功";
 
     /**

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -133,7 +133,7 @@ public class TaCompanyController extends BaseController {
         try {
             //使用分页插件
             IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
-            IPage<TaCompany> result = iTaCompanyService.selectListByOrgId(pg, companyCode, companyName, getOrgId(request));
+            IPage<TaCompany> result = iTaCompanyService.selectListByOrgId(pg, companyName, companyCode, getOrgId(request));
             List<TaCompany> taCompanyList = result.getRecords();
             for (TaCompany taCompany : taCompanyList){
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
@@ -173,7 +173,13 @@ public class TaCompanyController extends BaseController {
             queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
             queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
             queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
-            queryWrapper.eq(StringUtils.isNotBlank(authorizeStatus), "authorize_status", authorizeStatus);
+            if (CommConstant.AUTO_AUTH_STATUS.equals(authorizeStatus)){
+                queryWrapper.eq(StringUtils.isNotBlank(authorizeStatus), "authorize_status", authorizeStatus);
+            }
+            if (CommConstant.AUTO_UNAUTH_STATUS.equals(authorizeStatus)){
+                queryWrapper.nested(i -> i.eq("authorize_status", CommConstant.AUTO_UNAUTH_STATUS).or().isNull("authorize_status"));
+            }
+
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 

src/main/resources/mapper/eContract/TaCompanyMapper.xml

@@ -13,10 +13,10 @@
         left join ta_company_org a on t.company_id = a.company_id
         where a.org_id = #{orgId}
         <if test="companyCode != null and companyCode!=''">
-            and t.company_code = #{companyCode}
+            and t.company_code like CONCAT('%', #{companyCode}, '%')
         </if>
         <if test="companyName != null and companyName!=''">
-            and t.company_name = #{companyName}
+            and t.company_name like CONCAT('%', #{companyName}, '%')
         </if>
         and t.status = 4
         order by t.create_date desc