zz 1 年間 前
コミット
fff911c44f

+ 1 - 1
src/main/resources/mapper/base/Dept.xml

@@ -25,7 +25,7 @@
 
 	<select id="treeList" resultType="am.lodge.platform.model.Dept">
 		select id, name, case when PARENT_ID ='' or PARENT_ID is null then org_id else PARENT_ID end as parentId from SYS_Dept
-		where org_id = #{orgId}
+		where org_id = #{orgId} and enabled='1'
 		<if test="deptId!='11421101'.toString()"> and id= #{deptId}</if>
 		order by order_Num
 	</select>

+ 1 - 2
src/main/resources/mapper/base/Employee.xml

@@ -19,12 +19,11 @@
         <include refid="Columns"/>
         FROM
         sys_employee a join SYS_ORG_POST b on a.POST_ID=b.ID LEFT JOIN sys_user c ON a.id=c.PERSON_ID
-        <where>
+        where a.status='1'
             <if test="id != null">AND a.ID = #{id}</if>
             <if test="orgId != null">AND a.ORG_ID = #{orgId}</if>
             <if test="root != null">AND a.DEPT_ID is null</if>
             <if test="deptId != null">AND a.DEPT_ID = #{deptId}</if>
-        </where>
     </select>
 
 </mapper>