Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireChemicalController.java

@@ -85,7 +85,7 @@ public class FireChemicalController extends BaseController {
     *@param current 每页大小
     * @return
     */
-	@TycloudOperation(needAuth = true,ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "危化品分页查询",  notes = "危化品分页查询")
 	public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size ,String casNo, String formula, String name)
@@ -93,7 +93,8 @@ public class FireChemicalController extends BaseController {
 	    Page<FireChemicalDto> page=new Page<FireChemicalDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page, casNo,  formula,  name));
+	    boolean isDelete=false;
+	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page, casNo,  formula,  name,isDelete));
 	}
 	/**
 	*列表全部数据查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireChemicalServiceImpl.java

@@ -27,8 +27,8 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
         /**
          * 分页查询
          */
-        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page,   @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name)   {
-           return this.queryForPage(page, "", false,casNo, formula, name);
+        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page,   @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, boolean isDelete)   {
+           return this.queryForPage(page, "", false,casNo, formula, name,  isDelete);
         }
 
         /**