From cdb4df5b86eefa7c36e4746b7fc00d7d15b52ce6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 19:53:34 +0800
Subject: [PATCH] 数据权限优化，执法内容添加
---
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 2
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 8 +
project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java | 6 +
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java | 7 +
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java | 19 +++
project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java | 32 ++++++
project-system/src/main/resources/mapper/system/SysUserMapper.xml | 6
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 41 +++++++
project-system/src/main/resources/mapper/system/SysRoleMapper.xml | 2
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 60 +++++++++--
project-system/src/main/resources/mapper/system/SysDeptMapper.xml | 2
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java | 12 +
project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml | 37 +++++++
project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java | 5 +
project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java | 6 +
15 files changed, 214 insertions(+), 31 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index 0042cd2..d87f258 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -13,6 +13,7 @@
import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.service.IEnforceOrderService;
@@ -61,7 +62,7 @@
return AjaxResult.success(list);
}
- @ApiOperation("鎵ф硶鍗曞垪琛�")
+ @ApiOperation("鍒楄〃鈥斺�旀墽娉曠敵璇峰崟")
@GetMapping("/list")
public TableDataInfo list(EnforceOrderQueryBo bo)
{
@@ -70,7 +71,16 @@
return getDataTable(list);
}
- @ApiOperation("淇℃伅鍏紡鍒楄〃")
+ @ApiOperation("鍒楄〃鈥斺�旀墽娉曞緟涓婃姤")
+ @GetMapping("/execute/list")
+ public TableDataInfo executeList(EnforceOrderQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.getExecuteList(bo);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("鍒楄〃鈥斺�斾俊鎭叕寮�")
@GetMapping("/showList")
public TableDataInfo showList()
{
@@ -80,7 +90,7 @@
}
- @ApiOperation("瀹℃壒浜哄垪琛�")
+ @ApiOperation("鍒楄〃鈥斺�斿鎵逛汉寰呭鎵�")
@GetMapping("/checkList")
public TableDataInfo checkList(EnforceOrderQueryBo bo)
{
@@ -89,6 +99,31 @@
return getDataTable(list);
}
+ @ApiOperation("鍒楄〃鈥斺�斿鎵硅褰�")
+ @GetMapping("/checkedList")
+ public TableDataInfo checkedList(OrderCheckedQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.queryCheckedList(bo);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("鎵ф硶浜烘壂鐮�")
+ @GetMapping("/getScanList")
+ public AjaxResult scan(@RequestParam("companyCode") String companyCode)
+ {
+ List<EnforceOrderVo> list = iEnforceOrderService.getScanList(companyCode);
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation("纭鎵ф硶")
+ @Log(title = "鎵ф硶闃熷憳纭鎵ф硶", businessType = BusinessType.UPDATE)
+ @PostMapping("/doScanOrder/{orderId}")
+ public AjaxResult doScanOrder(@PathVariable("orderId") Long orderId)
+ {
+ return AjaxResult.success(iEnforceOrderService.doScanOrder(orderId));
+ }
+
@ApiOperation("鎵ф硶鍗曡妭鐐�")
@GetMapping("/orderNodeList")
public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
index b867b25..973090d 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
@@ -67,7 +67,11 @@
private String regionName;
- @ApiModelProperty("鎵ф硶鍘熷洜")
+ @ApiModelProperty("鎵ф硶鍐呭")
+ private String enforceContent;
+
+
+ @ApiModelProperty("鎵ф硶涓婚")
private String enforceReason;
@ApiModelProperty("鎵ф硶绫诲瀷")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
index 2febe57..10af5ea 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
@@ -61,8 +61,11 @@
@ApiModelProperty("鎵�灞炲尯鍩�")
private String regionName;
- /** 鎵ф硶鍘熷洜 */
- @ApiModelProperty("鎵ф硶鍘熷洜")
+ @ApiModelProperty("鎵ф硶鍐呭")
+ private String enforceContent;
+
+
+ @ApiModelProperty("鎵ф硶涓婚")
private String enforceReason;
@ApiModelProperty("鎵ф硶绫诲瀷")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
index f7748b6..b86c265 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
@@ -62,8 +62,12 @@
/** 鎵�灞炲尯鍩� */
@ApiModelProperty("鎵�灞炲尯鍩�")
private String regionName;
- /** 鎵ф硶鍘熷洜 */
- @ApiModelProperty("鎵ф硶鍘熷洜")
+
+ @ApiModelProperty("鎵ф硶鍐呭")
+ private String enforceContent;
+
+
+ @ApiModelProperty("鎵ф硶涓婚")
private String enforceReason;
@ApiModelProperty("鎵ф硶绫诲瀷")
@@ -186,7 +190,7 @@
@ApiModelProperty("鐢宠閮ㄩ棬ids")
private List<Long> applyDeptIds;
- @ApiModelProperty("鏄惁瀹℃壒鏌ヨ锛�1鏄�")
- private Integer isCheckQuery;
+
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java
new file mode 100644
index 0000000..20c4e17
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java
@@ -0,0 +1,19 @@
+package com.project.enforce.domain.bo.queryBo;
+
+import lombok.Data;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ */
+
+@Data
+public class OrderCheckedQueryBo
+{
+ private String enforceReason;//鎵ф硶涓婚
+ private Integer checkStatus ; //1閫氳繃锛�-1鎷掔粷
+
+ private Long userId;//瀹℃壒浜篿d
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
index ec14fbc..0472f38 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
@@ -53,8 +53,12 @@
@Excel(name = "鎵�灞炲尯鍩�")
@ApiModelProperty("鎵�灞炲尯鍩�")
private String regionName;
- @Excel(name = "鎵ф硶鍘熷洜")
- @ApiModelProperty("鎵ф硶鍘熷洜")
+
+ @ApiModelProperty("鎵ф硶鍐呭")
+ private String enforceContent;
+
+
+ @ApiModelProperty("鎵ф硶涓婚")
private String enforceReason;
@ApiModelProperty("鎵ф硶绫诲瀷")
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
index e3c2a9b..3c2657c 100644
--- a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -17,5 +19,8 @@
List<EnforceOrderVo> selectCheckList(EnforceOrderQueryBo bo);
+ List<EnforceOrderVo> selectCheckedList(OrderCheckedQueryBo bo);
+
+ List<EnforceOrderVo> selectScanList(@Param("companyCode") String companyCode,@Param("userId") Long userId);
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
index 9a485fc..0234118 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
@@ -4,6 +4,7 @@
import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.domain.vo.OrderNodeVo;
@@ -23,9 +24,23 @@
List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo);
/**
+ * 鎵ф硶涓婃姤鍒楄〃
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ List<EnforceOrderVo> getExecuteList(EnforceOrderQueryBo bo);
+
+ /**
* 鏌ヨ寰呭鏍稿垪琛�
*/
List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo);
+
+ /**
+ * 瀹℃壒浜哄鎵硅褰曞垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo);
/**
* 淇℃伅鍏紡鍒楄〃
@@ -77,4 +92,21 @@
* @return 鑺傜偣
*/
List<OrderNodeVo> orderNodeList(Long orderId);
+
+
+ /**
+ * 鎵ф硶鎵爜
+ * @param companyCode 浼佷笟缂栫爜
+ * @return 鎵ф硶鍗�
+ */
+ List<EnforceOrderVo> getScanList(String companyCode);
+
+ /**
+ * 纭鎵ф硶
+ * @param orderId 鎵ф硶鍗昳d
+ * @return 缁撴灉
+ */
+ Boolean doScanOrder(Long orderId);
+
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
index 90d2125..c16ded5 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
@@ -113,7 +113,7 @@
checkLog.setCheckId(loginUser.getUserId());
checkLog.setCheckUser(loginUser.getUserName());
checkLog.setCheckPhone(loginUser.getPhonenumber());
- checkLog.setCheckStatus(bo.getCheckStatus());
+ checkLog.setCheckStatus(bo.getCheckStatus()>0?1:-1);
checkLog.setCheckTime(DateUtils.getNowDate());
checkLog.setCheckReason(bo.getCheckReason());
boolean save = checkLogService.save(checkLog);
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index e22d765..7ca3bc4 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -16,6 +16,7 @@
import com.project.enforce.domain.EnforcePeer;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.mapper.EnforceOrderMapper;
@@ -55,9 +56,16 @@
public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- if (StringUtils.isNotEmpty(bo.getParams())) {
- qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
- }
+ qw.apply(StringUtils.isNotEmpty(bo.getParams().get("dataScope").toString()), bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
+ List<EnforceOrder> list = this.list(qw);
+ return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ @Override//鎵ф硶涓婃姤鍒楄〃
+ @DataScope(deptAlias = "execute_dept_id", userAlias = "execute_id")
+ public List<EnforceOrderVo> getExecuteList(EnforceOrderQueryBo bo) {
+ QueryWrapper<EnforceOrder> qw = getQw(bo);
+ qw.apply(StringUtils.isNotEmpty(bo.getParams().get("dataScope").toString()), bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -74,6 +82,13 @@
bo.setApplyDeptIds(null);
}
return this.baseMapper.selectCheckList(bo);
+ }
+
+ @Override
+ public List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo)
+ {
+ bo.setUserId(SecurityUtils.getUserId());
+ return this.baseMapper.selectCheckedList(bo);
}
@Override//淇℃伅鍏紡鍒楄〃
@@ -172,16 +187,38 @@
vos.add(new OrderNodeVo("瀹℃壒鎷掔粷",checkLog.getCheckUser(),checkLog.getCheckTime(), checkLog.getCheckReason()));
}
}
- } else {
- if (order.getInTime()!=null){
- vos.add(new OrderNodeVo("鎵爜鍏ヤ紒",order.getExecuteUser(),order.getInTime(), null));
- }
- if (order.getExecuteTime()!=null){
- vos.add(new OrderNodeVo("缁撴灉涓婃姤",order.getExecuteUser(),order.getExecuteTime(), null));
- }
+ }
+ if (order.getInTime()!=null){
+ vos.add(new OrderNodeVo("鎵爜鍏ヤ紒",order.getExecuteUser(),order.getInTime(), null));
+ }
+ if (order.getExecuteTime()!=null){
+ vos.add(new OrderNodeVo("缁撴灉涓婃姤",order.getExecuteUser(),order.getExecuteTime(), null));
}
return vos;
+ }
+
+ @Override//鎵爜缁撴灉
+ public List<EnforceOrderVo> getScanList(String companyCode)
+ {
+ Long userId = SecurityUtils.getUserId();
+ return this.baseMapper.selectScanList(companyCode, userId);
+ }
+
+ @Override//纭鎵爜鎵ф硶
+ @Transactional
+ public Boolean doScanOrder(Long orderId)
+ {
+ EnforceOrder order = this.getById(orderId);
+ order.setOrderStatus(3);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ order.setExecuteId(user.getUserId());
+ order.setExecuteUser(user.getNickName());
+ order.setExecutePhone(user.getRecommendPhone());
+ order.setExecuteDeptId(user.getDeptId());
+ order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
+ order.setInTime(DateUtils.getNowDate());
+ return this.updateById(order);
}
@@ -235,7 +272,8 @@
qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
- qw.eq(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
+ qw.like(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
+ qw.like(StringUtils.isNotEmpty(bo.getEnforceContent()), "enforce_content", bo.getEnforceContent());
qw.eq(StringUtils.isNotEmpty(bo.getEnforceType()), "enforce_type", bo.getEnforceType());
qw.eq(bo.getApplyId() != null, "apply_id", bo.getApplyId());
qw.eq(StringUtils.isNotEmpty(bo.getApplyUser()), "apply_user", bo.getApplyUser());
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
index 8878a5b..1eb759b 100644
--- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -15,6 +15,7 @@
<result property="companyAddress" column="company_address" />
<result property="regionCode" column="region_code" />
<result property="regionName" column="region_name" />
+ <result property="enforceContent" column="enforce_content" />
<result property="enforceReason" column="enforce_reason" />
<result property="enforceType" column="enforce_type" />
<result property="applyId" column="apply_id" />
@@ -59,7 +60,9 @@
parameterType="EnforceOrderQueryBo"
resultMap="EnforceOrderResult">
<include refid="selectEnforceOrderVo"/>
- <where>
+ where 1=1
+ and check_status !=2
+ and check_status!=-1
<if test="orderNo != null and orderNo != ''">
AND order_no like concat('%', #{orderNo}, '%')
</if>
@@ -72,14 +75,44 @@
<if test="checkIds != null and checkIds != '' ">
AND check_ids like concat('%', #{checkIds}, '%')
</if>
+ <if test="enforceReason != null and enforceReason != '' ">
+ AND enforce_reason like concat('%', #{enforceReason}, '%')
+ </if>
<if test="applyDeptIds != null and applyDeptIds !='' ">
AND apply_dept_id in
<foreach collection="applyDeptIds" item="applyDeptId" open="(" separator="," close=")">
#{applyDeptId}
</foreach>
</if>
- </where>
+
+ </select>
+
+ <select id="selectCheckedList"
+ parameterType="OrderCheckedQueryBo"
+ resultMap="EnforceOrderResult">
+ select t2.*
+ from enforce_check_log t1 join enforce_order t2 on t1.order_id = t2.order_id
+ where t2.del_flag = 0
+ and t1.check_id = #{userId}
+ <if test="checkStatus != null">
+ AND t2.check_status = #{checkStatus}
+ </if>
+ <if test="enforceReason != null and enforceReason != '' ">
+ AND t2.enforce_reason like concat('%', #{enforceReason}, '%')
+ </if>
+
</select>
+ <select id="selectScanList"
+ resultMap="EnforceOrderResult">
+ select t2.*
+ from enforce_peer t1 join enforce_order t2 on t1.order_id = t2.order_id
+ where
+ t2.del_flag = 0
+ and t2.order_status=2
+ AND t1.peer_id = #{userId}
+ AND t2.company_code = #{companyCode}
+
+ </select>
</mapper>
diff --git a/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java b/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
index 9c86359..0305543 100644
--- a/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
+++ b/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
@@ -82,6 +82,8 @@
String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext());
dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
controllerDataScope.userAlias(), permission);
+ } else {
+
}
}
}
@@ -173,5 +175,9 @@
BaseEntity baseEntity = (BaseEntity) params;
baseEntity.getParams().put(DATA_SCOPE, "");
}
+ else if (StringUtils.isNotNull(params) && params instanceof BaseQuery) {
+ BaseQuery baseQuery = (BaseQuery) params;
+ baseQuery.getParams().put(DATA_SCOPE, "");
+ }
}
}
diff --git a/project-system/src/main/resources/mapper/system/SysDeptMapper.xml b/project-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 2ae2cc8..92df8dd 100644
--- a/project-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -43,7 +43,7 @@
AND status = #{status}
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- <if test="params != null and params.dataScope != null">
+ <if test="params != null and params.dataScope != null and params.dataScope != ''">
AND ${params.dataScope}
</if>
order by d.parent_id, d.order_num
diff --git a/project-system/src/main/resources/mapper/system/SysRoleMapper.xml b/project-system/src/main/resources/mapper/system/SysRoleMapper.xml
index c801e1b..dcf1f0c 100644
--- a/project-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -52,7 +52,7 @@
and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- <if test="params != null and params.dataScope != null">
+ <if test="params != null and params.dataScope != null and params.dataScope != ''">
AND ${params.dataScope}
</if>
order by r.role_sort
diff --git a/project-system/src/main/resources/mapper/system/SysUserMapper.xml b/project-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0e54a13..9cd4df7 100644
--- a/project-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -92,7 +92,7 @@
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- <if test="params != null and params.dataScope != null">
+ <if test="params != null and params.dataScope != null and params.dataScope != ''">
AND ${params.dataScope}
</if>
</select>
@@ -111,7 +111,7 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- <if test="params != null and params.dataScope != null">
+ <if test="params != null and params.dataScope != null and params.dataScope != ''">
AND ${params.dataScope}
</if>
</select>
@@ -131,7 +131,7 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- <if test="params != null and params.dataScope != null">
+ <if test="params != null and params.dataScope != null and params.dataScope != ''">
AND ${params.dataScope}
</if>
</select>
--
Gitblit v1.9.1