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

# Conflicts:
#	src/main/resources/application-blue.yml

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

@@ -789,4 +789,9 @@ public class CommConstant {
      * 接口线上授权
      */
     public static final String ONLINEAUTH = "onLine";
+
+    /**
+     * 企业实名状态
+     */
+    public static final Integer REAL_NAME_STATUS = 4;
 }

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

@@ -123,7 +123,7 @@ public class TaCompanyController extends BaseController {
             QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
             queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
-            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("status", CommConstant.REAL_NAME_STATUS);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
@@ -153,10 +153,10 @@ public class TaCompanyController extends BaseController {
     @RequestMapping(value = "/channel/taCompanyList", method = RequestMethod.GET)
     public ResponseBean channelCompanyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                           @RequestParam(value = "companyName") String companyName,
-                                           @RequestParam(value = "companyCode")String companyCode,
-                                           @RequestParam(value = "certifiedStatus")String certifiedStatus,
-                                           @RequestParam(value = "authorizeStatus")String authorizeStatus) {
+                                           @RequestParam(value = "companyName", required = false) String companyName,
+                                           @RequestParam(value = "companyCode", required = false)String companyCode,
+                                           @RequestParam(value = "status", required = false)String status,
+                                           @RequestParam(value = "authorizeStatus", required = false)String authorizeStatus) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -164,9 +164,9 @@ public class TaCompanyController extends BaseController {
             QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
             queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
-            queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
+            queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
             queryWrapper.eq(StringUtils.isNotBlank(authorizeStatus), "authorize_status", authorizeStatus);
-            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
@@ -485,7 +485,8 @@ public class TaCompanyController extends BaseController {
      * 自动签章授权
      */
     @RequestMapping(value = "/channel/company/autoAuthCompany/{id}", method = RequestMethod.PUT)
-    public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request) throws Exception {
+        StringBuffer url = request.getRequestURL();
         ResponseBean responseBean = new ResponseBean();
         String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request));
         TaCompany taCompany = new TaCompany();