Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-server

web/src/main/java/com/jpsoft/employment/modules/base/controller/CompanyController.java

@@ -52,6 +52,7 @@ public class CompanyController {
 
         try {
             company.setId(UUID.randomUUID().toString());
+            company.setIsCertification("0");
             company.setDelFlag(false);
             company.setCreateBy(subject);
             company.setCreateTime(new Date());
@@ -201,11 +202,10 @@ public class CompanyController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
             String name,
             String scale,
             String industry,
-            Boolean isCertification,
+            String isCertification,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -233,7 +233,7 @@ public class CompanyController {
             searchParams.put("industry",industry);
         }
 
-        if (isCertification != null) {
+        if (StringUtils.isNotEmpty(isCertification)) {
             searchParams.put("isCertification",isCertification);
         }