Commit 4c913919 authored by chenzhao's avatar chenzhao

修改代码

parent 9bac7b1c
...@@ -434,7 +434,7 @@ public class WaterResourceController extends BaseController { ...@@ -434,7 +434,7 @@ public class WaterResourceController extends BaseController {
String classifyId, String classifyId,
String bizOrgCode, String bizOrgCode,
String equipCateGoryCode, String equipCateGoryCode,
List<String> ids) { @RequestParam(value = "ids", required = false) List<String> ids) {
Page<WaterResourceDto> page = new Page<>(); Page<WaterResourceDto> page = new Page<>();
page.setCurrent(pageNum); page.setCurrent(pageNum);
page.setSize(pageSize); page.setSize(pageSize);
......
...@@ -43,7 +43,7 @@ public interface JcsFeign { ...@@ -43,7 +43,7 @@ public interface JcsFeign {
@RequestParam(value = "belongFightingSystemId") Long belongFightingSystemId, @RequestParam(value = "belongFightingSystemId") Long belongFightingSystemId,
@RequestParam(value = "sequenceNbr") Long sequenceNbr, @RequestParam(value = "sequenceNbr") Long sequenceNbr,
@RequestParam(value = "classifyId") String classifyId, @RequestParam(value = "classifyId") String classifyId,
@RequestParam(value = "classifyId") List<String> ids @RequestParam(value = "ids") List<String> ids
); );
@RequestMapping(value = "/equip/fireSystem_waterResource/list", method = RequestMethod.GET, consumes = "application/json") @RequestMapping(value = "/equip/fireSystem_waterResource/list", method = RequestMethod.GET, consumes = "application/json")
......
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
</if> </if>
<choose> <choose>
<when test="identityType==1"> <when test="identityType==1">
And (a.orgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.orgCode= #{orgCode} ) And (a.orgCode LIKE CONCAT( #{orgCode}, '%' ) or a.orgCode= #{orgCode} )
<if test="companyId != null and companyId != ''"> and a.owner_id = #{companyId}</if> <if test="companyId != null and companyId != ''"> and a.owner_id = #{companyId}</if>
</when> </when>
<when test="identityType==2"> <when test="identityType==2">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment