yjwang пре 3 недеља
родитељ
комит
e390d9e73d

+ 1 - 1
fs-admin/src/main/java/com/fs/web/controller/system/SysDeptController.java

@@ -244,7 +244,7 @@ public class SysDeptController extends BaseController
         startPage();
         SysDeptConfigLog query = new SysDeptConfigLog();
         query.setDeptId(deptId);
-        query.setLogType(0); 
+        query.setLogType(0);
         List<SysDeptConfigLog> list = sysDeptConfigLogService.selectSysDeptConfigLogList(query);
         return getDataTable(list);
     }

+ 2 - 1
fs-service/src/main/resources/mapper/deptConfigLog/SysDeptConfigLogMapper.xml

@@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSysDeptConfigLogVo"/>
         <where>  
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="logType != null "> and log_type = #{logType}</if>
+            <if test="logType != null and logType &gt; 0"> and log_type = #{logType}</if>
+            <if test="logType != null and logType == 0"> and log_type in (0,2)</if>
             <if test="operateType != null "> and operate_type = #{operateType}</if>
             <if test="num != null "> and num = #{num}</if>
             <if test="firstNum != null "> and first_num = #{firstNum}</if>