完善权限+正则

work-modules/work-manage/src/main/resources/mapper/EmpMapper.xml

@@ -15,9 +15,8 @@
         </where>
     </select>
 
-    <insert id="add">
+    <insert id="add" useGeneratedKeys="true" keyProperty="empId">
-        insert into tb_employee (emp_name, username, password, emp_tel, emp_id_card, emp_age, emp_gender, emp_address,  emp_sal)
+        <include refid="com.bwie.manage.mapper.ManagerMapper.insertEmp"></include>
-        values (#{empName},#{username},#{password},#{empTel},#{empIdCard},#{empAge},#{empGender},#{empAddress},#{empSal})
     </insert>
 
     <select id="findById" resultType="com.bwie.common.domain.Emp">
@@ -26,15 +25,15 @@
 
     <update id="update">
         update tb_employee set
-                               emp_name = #{empName},
+           emp_name = #{empName},
-                               username = #{username},
+           username = #{username},
-                               password = #{password},
+           password = #{password},
-                               emp_tel = #{empTel},
+           emp_tel = #{empTel},
-                               emp_id_card = #{empIdCard},
+           emp_id_card = #{empIdCard},
-                               emp_age = #{empAge},
+           emp_age = #{empAge},
-                               emp_gender = #{empGender},
+           emp_gender = #{empGender},
-                               emp_address = #{empAddress},
+           emp_address = #{empAddress},
-                               emp_sal = #{empSal}
+           emp_sal = #{empSal}
         where emp_id = #{empId}
     </update>
 

work-modules/work-manage/src/main/resources/mapper/ManagerMapper.xml

@@ -27,23 +27,26 @@
                  left join tb_post p on ep.post_id = p.post_id
     </sql>
 
+    <sql id="insertEmp">
+        insert into tb_employee (emp_name, username, password, emp_tel, emp_id_card, emp_age, emp_gender, emp_address,  emp_sal)
+        values (#{empName},#{username},#{password},#{empTel},#{empIdCard},#{empAge},#{empGender},#{empAddress},#{empSal})
+    </sql>
+
     <select id="list" resultType="com.bwie.common.domain.response.EmpResponse">
         <include refid="selectEmpVo"/>
         <where>
-            er.role_id = 2 or er.role_id = 3
+            er.role_id in (2, 3)
             <if test="null != empName  and  '' != empName">
                 and e.emp_name like concat('%',#{empName},'%')
             </if>
         </where>
     </select>
 
-
+    <insert id="add" useGeneratedKeys="true" keyProperty="empId">
-    <insert id="add">
+        <include refid="insertEmp"></include>
-        insert into tb_employee (emp_name, username, password, emp_tel, emp_id_card, emp_age, emp_gender, emp_address,  emp_sal)
-        values (#{empName},#{username},#{password},#{empTel},#{empIdCard},#{empAge},#{empGender},#{empAddress},#{empSal})
     </insert>
 
-    <select id="findById" resultType="com.bwie.common.domain.Emp">
+    <select id="findById" resultType="com.bwie.common.domain.response.EmpResponse">
         <include refid="selectEmpVo"/> where e.emp_id = #{empId}
     </select>