diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProDepartController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProDepartController.java index ce62e6b..56e8d72 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProDepartController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProDepartController.java @@ -43,7 +43,7 @@ public class TbProDepartController extends BaseController { * @return 查询结果 */ @ApiOperation(value = "分页查询项目部信息") - //@RequiresPermissions("base:depart:list") + @RequiresPermissions("base:depart:list") @GetMapping("/list") @SysLog(title = "项目部管理", businessType = OperaType.QUERY, module = "基础管理->项目部管理") public AjaxResult list(TbProDepart tbProDepart) { diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml index 81dfdb6..1dc94c7 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml @@ -39,12 +39,15 @@ where del_flag = 0 and tbr.depart_name like concat('%',#{departName},'%') + and tbr.depart_name NOT LIKE '%_%' ESCAPE '/' and tbr.pro_name like concat('%',#{proName},'%') + and tbr.pro_name NOT LIKE '%_%' ESCAPE '/' and tbr.rel_user like concat('%',#{relUser},'%') + and tbr.rel_user NOT LIKE '%_%' ESCAPE '/' and DATE_FORMAT(tbr.create_time, '%Y-%m-%d') = #{applyTime} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml index 8d2973b..d3c87cb 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml @@ -49,6 +49,7 @@ tddr.is_warn = '1' and tddr.dev_name like concat('%',#{devName},'%') + and tddr.dev_name NOT LIKE '%_%' ESCAPE '/' and tddr.dev_type = #{devType} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml index 9b9fdda..3900df1 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml @@ -287,9 +287,11 @@ and td.dev_name like concat('%',#{devName},'%') + and td.dev_name NOT LIKE '%_%' ESCAPE '/' and td.dev_code like concat('%',#{devCode},'%') + and td.dev_code NOT LIKE '%_%' ESCAPE '/' and td.dev_status = #{devStatus} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml index 8ba0694..f468ea5 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml @@ -21,6 +21,7 @@ and tp.rel_name like concat('%',#{relName},'%') + and tp.rel_name NOT LIKE '%_%' ESCAPE '/' and tp.sex = #{sex} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml index b1e26df..f6fb1c6 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml @@ -12,6 +12,7 @@ and tb.gt_name like concat('%',#{gtName},'%') + and tb.gt_name NOT LIKE '%_%' ESCAPE '/' diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml index 7672dee..80c9ab9 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml @@ -45,6 +45,7 @@ and tpd.depart_name like concat('%',#{departName},'%') + and tpd.depart_name NOT LIKE '%_%' ESCAPE '/' and tb.depart_id = #{departId} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml index 9e1c232..68b70ab 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml @@ -25,10 +25,12 @@ and id = #{id} - and team_name like concat('%',#{teamName},'%') + and tt.team_name like concat('%',#{teamName},'%') + and tt.team_name NOT LIKE '%_%' ESCAPE '/' and tt.rel_name like concat('%',#{relName},'%') + and tt.rel_name NOT LIKE '%_%' ESCAPE '/' and ( diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml index ebad316..935526e 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml @@ -411,6 +411,7 @@ and twc.config_name like concat('%',#{configName},'%') + and twc.config_name NOT LIKE '%_%' ESCAPE '/' and td.id = #{devId}