diff --git a/src/main/java/com/cm/systemcity/controller/apis/dict/DictController.java b/src/main/java/com/cm/systemcity/controller/apis/dict/DictController.java index 30b8ec3..052c040 100755 --- a/src/main/java/com/cm/systemcity/controller/apis/dict/DictController.java +++ b/src/main/java/com/cm/systemcity/controller/apis/dict/DictController.java @@ -105,7 +105,7 @@ public class DictController extends AbstractController { @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listdict/{dictParentId}") public List listDict(@PathVariable("dictParentId") String dictParentId) throws SearchException { - Map params = getParams(); + Map params = requestParams(); params.put("dictParentId", dictParentId); return dictService.listDict(params); } diff --git a/src/main/resources/mybatis/mapper/dict/dict-mapper.xml b/src/main/resources/mybatis/mapper/dict/dict-mapper.xml index a8bd6a8..3edd777 100755 --- a/src/main/resources/mybatis/mapper/dict/dict-mapper.xml +++ b/src/main/resources/mybatis/mapper/dict/dict-mapper.xml @@ -150,6 +150,10 @@ #{dictIds[${index}]} + + AND + t1.is_hide = #{isHide} + ORDER BY diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml index 2751db5..714a6aa 100755 --- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml +++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml @@ -463,8 +463,23 @@ #{reporterIds[${index}]} + + + - AND t1.case_type_id = #{caseTypeId} + AND t1.case_type_id IN ( + SELECT + cd.dict_id + FROM + city_dict cd + WHERE + cd.is_delete = 0 + AND ( + dict_id = #{caseTypeId} + OR + dict_parent_id = #{caseTypeId} + ) + ) AND FIND_IN_SET(t1.case_status, #{caseStatus}) @@ -1883,10 +1898,10 @@ AND case_type_id = #{caseTypeId} - AND gmt_create = ]]> #{startTime} + AND LEFT(gmt_create, 10) = ]]> #{startTime} - AND gmt_create #{endTime} + AND LEFT(gmt_create, 10) #{endTime} AND ( diff --git a/src/main/resources/static/route/reportcase/list_placeonfile.html b/src/main/resources/static/route/reportcase/list_placeonfile.html index b7d5fbb..374525c 100755 --- a/src/main/resources/static/route/reportcase/list_placeonfile.html +++ b/src/main/resources/static/route/reportcase/list_placeonfile.html @@ -13,6 +13,7 @@ +