修改部门id，dept改为dept_id

ims-service/ims-eval/src/main/java/com/ims/eval/config/permission/PermissionAspect.java

@@ -53,7 +53,7 @@ public class PermissionAspect implements Interceptor {
 
 	//扫描的包路径，需要权限的加在mapper类及方法上
 	private String packagePath = "com.ims.eval.dao";
-	private final static String DEPT_ID = "dept";
+	private final static String DEPT_ID = "dept_id";
 	private final static String DEPT_MARK = "BM0001";
 
 	/**  start  以下定义的数据需要和部门表一致       **/

ims-service/ims-eval/src/main/java/com/ims/eval/entity/Indicator.java

@@ -94,7 +94,7 @@ public class Indicator extends Model {
     /**
      * 部门
      */
-    private String dept;
+    private String deptId;
 
 	/**
 	 * 部门name

ims-service/ims-eval/src/main/resources/mappers/IndicatorMapper.xml

@@ -15,7 +15,7 @@
         <result column="is_child" property="isChild" />
         <result column="bin_section" property="binSection" />
         <result column="bin_stage" property="binStage" />
-        <result column="dept" property="dept" />
+        <result column="dept_id" property="deptId" />
         <result column="company" property="company" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -29,7 +29,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, indicator_name, indicator_code, unit, indicator_type_id, coefficient, is_quantified, is_additional, is_child, bin_section, bin_stage, dept, company, create_time, update_time, create_by, update_by, enable, remark, des, order_num
+        id, indicator_name, indicator_code, unit, indicator_type_id, coefficient, is_quantified, is_additional, is_child, bin_section, bin_stage, dept_id, company, create_time, update_time, create_by, update_by, enable, remark, des, order_num
     </sql>
 
     <select id="selectByCode" resultType="com.ims.eval.entity.Indicator">
@@ -74,8 +74,8 @@
                 AND i.bin_stage = #{binStage}
             </if>
 
-            <if test="dept !=null and dept !=''">
-                AND i.dept = #{dept}
+            <if test="dept_id !=null and dept_id !=''">
+                AND i.dept_id = #{dept}
             </if>
 
             <if test="company !=null and company !=''">
@@ -127,13 +127,13 @@
         i.*,t.type_name indicatorTypeName,
         b.stage_name binStageName,
         bs.section_name binSectionName,
-        dd.key_name deptName
+        dd.key_name dept_idName
         FROM
         indicator i
         LEFT JOIN indicator_type t  ON i.indicator_type_id = t.id
         LEFT JOIN bin_stage b  ON i.bin_stage = b.id
         LEFT JOIN bin_section bs  ON i.bin_section = bs.id
-        inner join data_dictionary dd on dd.data_key = i.dept
+        inner join data_dictionary dd on dd.data_key = i.dept_id
         <where>
 
 
@@ -156,8 +156,8 @@
                 AND i.bin_stage = #{binStage}
             </if>
 
-            <if test="dept !=null and dept !=''">
-                AND i.dept = #{dept}
+            <if test="dept_id !=null and dept_id !=''">
+                AND i.dept_id = #{dept}
             </if>
 
             <if test="company !=null and company !=''">