20181221通用IFRAME

src/main/java/com/izouma/awesomeadmin/dao/DepartInfoMapper.xml

@@ -420,13 +420,16 @@
                     WHERE
                         child_depart.id = (
                             SELECT
-                                depart_id
+                                sys_user_depart.depart_id
                             FROM
-                                sys_user_depart
+                                sys_user_depart,
+                                sys_user
                             WHERE
-                                sys_user_depart.user_id =  #{userId}
+                                sys_user_depart.user_id = #{userId}
+                            AND sys_user.inherit_flag = 'Y'
+                            AND sys_user.id = #{userId}
                             ORDER BY
-                                id DESC
+                                sys_user_depart.id DESC
                             LIMIT 1
                         )
                 )

src/main/java/com/izouma/awesomeadmin/dao/TestAaaMapper.xml

@@ -1,151 +1,152 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.izouma.awesomeadmin.dao.TestAaaMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TestAaa" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="image_url" property="imageUrl" jdbcType="VARCHAR" />
-                                <result column="test_name" property="testName" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="multi_select" property="multiSelect" jdbcType="VARCHAR" />
-                                <result column="test_time" property="testTime" jdbcType="TIMESTAMP" />
-                                <result column="login_user" property="loginUser" jdbcType="VARCHAR" />
-                                <result column="testc_time" property="testcTime" jdbcType="TIMESTAMP" />
-                                <result column="testc_date" property="testcDate" jdbcType="TIMESTAMP" />
-                                <result column="work_number" property="workNumber" jdbcType="VARCHAR" />
-                                <result column="depart_id" property="departId" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
+<mapper namespace="com.izouma.awesomeadmin.dao.TestAaaMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TestAaa">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="image_url" property="imageUrl" jdbcType="VARCHAR"/>
+        <result column="test_name" property="testName" jdbcType="VARCHAR"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="multi_select" property="multiSelect" jdbcType="VARCHAR"/>
+        <result column="test_time" property="testTime" jdbcType="TIMESTAMP"/>
+        <result column="login_user" property="loginUser" jdbcType="VARCHAR"/>
+        <result column="testc_time" property="testcTime" jdbcType="TIMESTAMP"/>
+        <result column="testc_date" property="testcDate" jdbcType="TIMESTAMP"/>
+        <result column="work_number" property="workNumber" jdbcType="VARCHAR"/>
+        <result column="depart_id" property="departId" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
         id, del_flag, image_url, test_name, remark, multi_select, test_time, login_user, testc_time, testc_date, work_number, depart_id    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from test_aaa
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from test_aaa
         where id = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TestAaa" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TestAaa" useGeneratedKeys="true"
+            keyProperty="id">
         insert into test_aaa
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!= null">
                 id,
             </if>
-                <if test="delFlag!= null" >
+            <if test="delFlag!= null">
                 del_flag,
             </if>
-                <if test="imageUrl!= null" >
+            <if test="imageUrl!= null">
                 image_url,
             </if>
-                <if test="testName!= null" >
+            <if test="testName!= null">
                 test_name,
             </if>
-                <if test="remark!= null" >
+            <if test="remark!= null">
                 remark,
             </if>
-                <if test="multiSelect!= null" >
+            <if test="multiSelect!= null">
                 multi_select,
             </if>
-                <if test="testTime!= null" >
+            <if test="testTime!= null">
                 test_time,
             </if>
-                <if test="loginUser!= null" >
+            <if test="loginUser!= null">
                 login_user,
             </if>
-                <if test="testcTime!= null" >
+            <if test="testcTime!= null">
                 testc_time,
             </if>
-                <if test="testcDate!= null" >
+            <if test="testcDate!= null">
                 testc_date,
             </if>
-                <if test="workNumber!= null" >
+            <if test="workNumber!= null">
                 work_number,
             </if>
-                <if test="departId!= null" >
+            <if test="departId!= null">
                 depart_id,
             </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
                 #{id,jdbcType=INTEGER},
             </if>
-                    <if test="delFlag != null" >
+            <if test="delFlag != null">
                 #{delFlag,jdbcType=CHAR},
             </if>
-                    <if test="imageUrl != null" >
+            <if test="imageUrl != null">
                 #{imageUrl,jdbcType=VARCHAR},
             </if>
-                    <if test="testName != null" >
+            <if test="testName != null">
                 #{testName,jdbcType=VARCHAR},
             </if>
-                    <if test="remark != null" >
+            <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},
             </if>
-                    <if test="multiSelect != null" >
+            <if test="multiSelect != null">
                 #{multiSelect,jdbcType=VARCHAR},
             </if>
-                    <if test="testTime != null" >
+            <if test="testTime != null">
                 #{testTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="loginUser != null" >
+            <if test="loginUser != null">
                 #{loginUser,jdbcType=VARCHAR},
             </if>
-                    <if test="testcTime != null" >
+            <if test="testcTime != null">
                 #{testcTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="testcDate != null" >
+            <if test="testcDate != null">
                 #{testcDate,jdbcType=TIMESTAMP},
             </if>
-                    <if test="workNumber != null" >
+            <if test="workNumber != null">
                 #{workNumber,jdbcType=VARCHAR},
             </if>
-                    <if test="departId != null" >
+            <if test="departId != null">
                 #{departId,jdbcType=VARCHAR},
             </if>
-                </trim>
+        </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TestAaa" >
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TestAaa">
         update test_aaa
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
+        <set>
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
             </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
             </if>
-                     <if test="imageUrl != null" >
-               image_url= #{imageUrl,jdbcType=VARCHAR},
+            <if test="imageUrl != null">
+                image_url= #{imageUrl,jdbcType=VARCHAR},
             </if>
-                     <if test="testName != null" >
-               test_name= #{testName,jdbcType=VARCHAR},
+            <if test="testName != null">
+                test_name= #{testName,jdbcType=VARCHAR},
             </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
             </if>
-                     <if test="multiSelect != null" >
-               multi_select= #{multiSelect,jdbcType=VARCHAR},
+            <if test="multiSelect != null">
+                multi_select= #{multiSelect,jdbcType=VARCHAR},
             </if>
-                     <if test="testTime != null" >
-               test_time= #{testTime,jdbcType=TIMESTAMP},
+            <if test="testTime != null">
+                test_time= #{testTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="loginUser != null" >
-               login_user= #{loginUser,jdbcType=VARCHAR},
+            <if test="loginUser != null">
+                login_user= #{loginUser,jdbcType=VARCHAR},
             </if>
-                     <if test="testcTime != null" >
-               testc_time= #{testcTime,jdbcType=TIMESTAMP},
+            <if test="testcTime != null">
+                testc_time= #{testcTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="testcDate != null" >
-               testc_date= #{testcDate,jdbcType=TIMESTAMP},
+            <if test="testcDate != null">
+                testc_date= #{testcDate,jdbcType=TIMESTAMP},
             </if>
-                     <if test="workNumber != null" >
-               work_number= #{workNumber,jdbcType=VARCHAR},
+            <if test="workNumber != null">
+                work_number= #{workNumber,jdbcType=VARCHAR},
             </if>
-                     <if test="departId != null" >
-               depart_id= #{departId,jdbcType=VARCHAR},
+            <if test="departId != null">
+                depart_id= #{departId,jdbcType=VARCHAR},
             </if>
-                 </set>
+        </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
             id = #{id,jdbcType=INTEGER}
@@ -156,59 +157,61 @@
         </if>
     </update>
     <select id="queryTestAaaByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestAaa">
-        select <include refid="Base_Column_List"/> from test_aaa
+        select
+        <include refid="Base_Column_List"/>
+        from test_aaa
         <where>
             and del_flag = 'N'
             <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
                 and id in (${record.idStr})
             </if>
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
             </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
             </if>
-                     <if test="record.imageUrl != null and !&quot;&quot;.equals(record.imageUrl)">
-                and  image_url = #{record.imageUrl}
+            <if test="record.imageUrl != null and !&quot;&quot;.equals(record.imageUrl)">
+                and image_url = #{record.imageUrl}
             </if>
-                     <if test="record.testName != null and !&quot;&quot;.equals(record.testName)">
-                and  test_name = #{record.testName}
+            <if test="record.testName != null and !&quot;&quot;.equals(record.testName)">
+                and test_name = #{record.testName}
             </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
             </if>
-                     <if test="record.multiSelect != null and !&quot;&quot;.equals(record.multiSelect)">
-                and  multi_select = #{record.multiSelect}
+            <if test="record.multiSelect != null and !&quot;&quot;.equals(record.multiSelect)">
+                and multi_select = #{record.multiSelect}
             </if>
-                     <if test="record.testTime != null and !&quot;&quot;.equals(record.testTime)">
-                and  test_time = #{record.testTime}
+            <if test="record.testTime != null and !&quot;&quot;.equals(record.testTime)">
+                and test_time = #{record.testTime}
             </if>
-                     <if test="record.loginUser != null and !&quot;&quot;.equals(record.loginUser)">
-                and  login_user = #{record.loginUser}
+            <if test="record.loginUser != null and !&quot;&quot;.equals(record.loginUser)">
+                and login_user = #{record.loginUser}
             </if>
-                     <if test="record.testcTime != null and !&quot;&quot;.equals(record.testcTime)">
-                and  testc_time = #{record.testcTime}
+            <if test="record.testcTime != null and !&quot;&quot;.equals(record.testcTime)">
+                and testc_time = #{record.testcTime}
             </if>
-                     <if test="record.testcDate != null and !&quot;&quot;.equals(record.testcDate)">
-                and  testc_date = #{record.testcDate}
+            <if test="record.testcDate != null and !&quot;&quot;.equals(record.testcDate)">
+                and testc_date = #{record.testcDate}
             </if>
-                     <if test="record.workNumber != null and !&quot;&quot;.equals(record.workNumber)">
-                and  work_number = #{record.workNumber}
+            <if test="record.workNumber != null and !&quot;&quot;.equals(record.workNumber)">
+                and work_number = #{record.workNumber}
             </if>
-                     <if test="record.departId != null and !&quot;&quot;.equals(record.departId)">
-                and  depart_id = #{record.departId}
+            <if test="record.departId != null and !&quot;&quot;.equals(record.departId)">
+                and depart_id = #{record.departId}
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR image_url LIKE concat('%',#{record.searchKey},'%')
+                    OR test_name LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR multi_select LIKE concat('%',#{record.searchKey},'%')
+                    OR login_user LIKE concat('%',#{record.searchKey},'%')
+                    OR work_number LIKE concat('%',#{record.searchKey},'%')
+                    OR depart_id LIKE concat('%',#{record.searchKey},'%')
+                </trim>
             </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                OR  image_url LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  test_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  multi_select LIKE concat('%',#{record.searchKey},'%')
-                                                                                                                                                                     OR  login_user LIKE concat('%',#{record.searchKey},'%')
-                                                                                                                                                                                                                                      OR  work_number LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  depart_id LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
-         </if>
 
             <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
                 <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
@@ -275,105 +278,107 @@
         id desc
     </select>
     <select id="queryAllTestAaa" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestAaa">
-        select <include refid="Base_Column_List"/> from test_aaa
+        select
+        <include refid="Base_Column_List"/>
+        from test_aaa
         <where>
             and del_flag = 'N'
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
                 and id in (${idStr})
             </if>
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
             </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
             </if>
-                    <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and  image_url = #{imageUrl}
+            <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
+                and image_url = #{imageUrl}
             </if>
-                    <if test="testName != null and !&quot;&quot;.equals(testName)">
-                and  test_name = #{testName}
+            <if test="testName != null and !&quot;&quot;.equals(testName)">
+                and test_name = #{testName}
             </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
             </if>
-                    <if test="multiSelect != null and !&quot;&quot;.equals(multiSelect)">
-                and  multi_select = #{multiSelect}
+            <if test="multiSelect != null and !&quot;&quot;.equals(multiSelect)">
+                and multi_select = #{multiSelect}
             </if>
-                    <if test="testTime != null and !&quot;&quot;.equals(testTime)">
-                and  test_time = #{testTime}
+            <if test="testTime != null and !&quot;&quot;.equals(testTime)">
+                and test_time = #{testTime}
             </if>
-                    <if test="loginUser != null and !&quot;&quot;.equals(loginUser)">
-                and  login_user = #{loginUser}
+            <if test="loginUser != null and !&quot;&quot;.equals(loginUser)">
+                and login_user = #{loginUser}
             </if>
-                    <if test="testcTime != null and !&quot;&quot;.equals(testcTime)">
-                and  testc_time = #{testcTime}
+            <if test="testcTime != null and !&quot;&quot;.equals(testcTime)">
+                and testc_time = #{testcTime}
             </if>
-                    <if test="testcDate != null and !&quot;&quot;.equals(testcDate)">
-                and  testc_date = #{testcDate}
+            <if test="testcDate != null and !&quot;&quot;.equals(testcDate)">
+                and testc_date = #{testcDate}
             </if>
-                    <if test="workNumber != null and !&quot;&quot;.equals(workNumber)">
-                and  work_number = #{workNumber}
+            <if test="workNumber != null and !&quot;&quot;.equals(workNumber)">
+                and work_number = #{workNumber}
             </if>
-                    <if test="departId != null and !&quot;&quot;.equals(departId)">
-                and  depart_id = #{departId}
+            <if test="departId != null and !&quot;&quot;.equals(departId)">
+                and depart_id = #{departId}
             </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                OR  image_url LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  test_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  multi_select LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                                                                                                                        OR  login_user LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                                                                                                                                                                                                                        OR  work_number LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  depart_id LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR image_url LIKE concat('%',#{searchKey},'%')
+                    OR test_name LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR multi_select LIKE concat('%',#{searchKey},'%')
+                    OR login_user LIKE concat('%',#{searchKey},'%')
+                    OR work_number LIKE concat('%',#{searchKey},'%')
+                    OR depart_id LIKE concat('%',#{searchKey},'%')
+                </trim>
             </if>
-<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-        <choose>
-            <when test="item.indexOf('like') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        concat('%',#{itemDetail},'%')
-                    </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
 
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
-                </foreach>
-            </when>
-            <when test="item.indexOf('in') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        (${itemDetail})
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                            </foreach>
+                        </when>
+                        <when test="item.indexOf('in') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    (${itemDetail})
+                                </if>
 
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        #{itemDetail}
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
-                </foreach>
-            </otherwise>
-        </choose>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
 
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
-    </foreach>
+                            </foreach>
+                        </otherwise>
+                    </choose>
 
 
-</if>
+                </foreach>
+
+
+            </if>
         </where>
         order by
 
@@ -393,46 +398,48 @@
         id desc
     </select>
     <select id="queryTestAaa" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestAaa">
-        select <include refid="Base_Column_List"/> from test_aaa
+        select
+        <include refid="Base_Column_List"/>
+        from test_aaa
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
+            <if test="id != null and !&quot;&quot;.equals(id)">
                 and id = #{id}
             </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
-                     <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
+            <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
                 and image_url = #{imageUrl}
             </if>
-                     <if test="testName != null and !&quot;&quot;.equals(testName)">
+            <if test="testName != null and !&quot;&quot;.equals(testName)">
                 and test_name = #{testName}
             </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
             </if>
-                     <if test="multiSelect != null and !&quot;&quot;.equals(multiSelect)">
+            <if test="multiSelect != null and !&quot;&quot;.equals(multiSelect)">
                 and multi_select = #{multiSelect}
             </if>
-                     <if test="testTime != null and !&quot;&quot;.equals(testTime)">
+            <if test="testTime != null and !&quot;&quot;.equals(testTime)">
                 and test_time = #{testTime}
             </if>
-                     <if test="loginUser != null and !&quot;&quot;.equals(loginUser)">
+            <if test="loginUser != null and !&quot;&quot;.equals(loginUser)">
                 and login_user = #{loginUser}
             </if>
-                     <if test="testcTime != null and !&quot;&quot;.equals(testcTime)">
+            <if test="testcTime != null and !&quot;&quot;.equals(testcTime)">
                 and testc_time = #{testcTime}
             </if>
-                     <if test="testcDate != null and !&quot;&quot;.equals(testcDate)">
+            <if test="testcDate != null and !&quot;&quot;.equals(testcDate)">
                 and testc_date = #{testcDate}
             </if>
-                     <if test="workNumber != null and !&quot;&quot;.equals(workNumber)">
+            <if test="workNumber != null and !&quot;&quot;.equals(workNumber)">
                 and work_number = #{workNumber}
             </if>
-                     <if test="departId != null and !&quot;&quot;.equals(departId)">
+            <if test="departId != null and !&quot;&quot;.equals(departId)">
                 and depart_id = #{departId}
             </if>
-         
+
         </where>
         LIMIT 1
     </select>
@@ -448,10 +455,12 @@
         </if>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestAaa">
-        select <include refid="Base_Column_List"/> from test_aaa
+        select
+        <include refid="Base_Column_List"/>
+        from test_aaa
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </where>
+        </where>
         order by id desc
     </select>
 </mapper>

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -22,6 +22,7 @@
         <result column="work_number" property="workNumber" jdbcType="VARCHAR"/>
         <result column="config" property="config" jdbcType="VARCHAR"/>
         <result column="mis_child" property="misChild" jdbcType="VARCHAR"/>
+        <result column="inherit_flag" property="inheritFlag" jdbcType="CHAR"/>
         <association property="departId" javaType="string" column="id"
                      select="com.izouma.awesomeadmin.dao.DepartInfoMapper.getUserDepartId"/>
         <association property="roleId" javaType="string" column="id"
@@ -29,7 +30,8 @@
     </resultMap>
     <sql id="Base_Column_List">
         id, username, nickname, icon, birthday, sex, open_id, union_id, phone, mail,
-        country, province, city, district, create_time, del_flag, work_number, config, mis_child
+        country, province, city, district, create_time, del_flag, work_number, config,
+        mis_child, inherit_flag
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -109,6 +111,9 @@
             <if test="misChild != null">
                 mis_child,
             </if>
+            <if test="inheritFlag != null">
+                inherit_flag,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -174,6 +179,9 @@
             <if test="misChild != null">
                 #{misChild,jdbcType=VARCHAR},
             </if>
+            <if test="inheritFlag != null">
+                #{inheritFlag,jdbcType=CHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserInfo">
@@ -239,6 +247,9 @@
             <if test="misChild != null">
                 mis_child = #{misChild,jdbcType=VARCHAR},
             </if>
+            <if test="inheritFlag != null">
+                inherit_flag = #{inheritFlag,jdbcType=CHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>

src/main/java/com/izouma/awesomeadmin/model/UserInfo.java

@@ -59,6 +59,8 @@ public class UserInfo {
 
     private String misChild;
 
+    private String inheritFlag;
+
     public String getToken() {
         return token;
     }
@@ -242,5 +244,13 @@ public class UserInfo {
     public void setMisChild(String misChild) {
         this.misChild = misChild;
     }
+
+    public String getInheritFlag() {
+        return inheritFlag;
+    }
+
+    public void setInheritFlag(String inheritFlag) {
+        this.inheritFlag = inheritFlag;
+    }
 }
 

src/main/vue/src/pages/Departs.vue

@@ -148,11 +148,11 @@ export default {
             this.menu = {
                 id: data.extra.id,
                 departName: data.extra.departName,
-                departCode: data.extra.departCode||'',
-                misInclude: data.extra.misInclude||'',
-                misOrgCode: data.extra.misOrgCode||'',
-                misOrgName: data.extra.misOrgName||'',
-                misChild: data.extra.misChild||'',
+                departCode: data.extra.departCode || '',
+                misInclude: data.extra.misInclude || '',
+                misOrgCode: data.extra.misOrgCode || '',
+                misOrgName: data.extra.misOrgName || '',
+                misChild: data.extra.misChild || '',
             };
             this.dialogVisible = true;
             if (this.menu.misChild) {
@@ -285,9 +285,15 @@ export default {
                             return a.extra.sort - b.extra.sort;
                         });
                         return trees.map(i => {
+
+                            var mis = '';
+                            if (i.extra.misOrgCode && i.extra.misOrgName) {
+
+                                mis = '(' + i.extra.misOrgCode + ',' + i.extra.misOrgName + ')'
+                            }
                             let t = {
                                 id: i.id,
-                                label: i.name,
+                                label: i.name + mis,
                                 parentId: i.parentId,
                                 extra: i.extra
                             };

src/main/vue/src/pages/User.vue

@@ -23,10 +23,15 @@
                 </el-select>
             </el-form-item>
             <el-form-item prop="departId" label="部门">
-                <el-cascader :options="departs" v-model="formData.departId">
+                <el-cascader :options="departs" v-model="formData.departId" :change-on-select="true">
                 </el-cascader>
             </el-form-item>
 
+            <el-form-item prop="inheritFlag" label="继承部门下辖子部门">
+                <el-switch v-model="formData.inheritFlag" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+            </el-form-item>
+
             <el-form-item prop="misChild" label="子部门">
                 <el-tree ref="misChildTree" :data="departs" :highlight-current="true" :expand-on-click-node="false" node-key="value" label="label" show-checkbox default-expand-all>
                 </el-tree>
@@ -68,6 +73,8 @@ export default {
                     }
 
                     this.formData = res.data;
+
+                    this.formData.inheritFlag = this.formData.inheritFlag == 'Y' ? true : false;
                 }
             })
         }
@@ -154,6 +161,8 @@ export default {
         submit() {
             this.formData.misChild = this.$refs.misChildTree.getCheckedKeys(false).join();
             var data = JSON.parse(JSON.stringify(this.formData));
+            data.inheritFlag = this.formData.inheritFlag ? 'Y' : 'N';
+
             this.$http.post({
                 url: this.formData.id ? '/userInfo/update' : '/userInfo/save',
                 data: data