|
|
@@ -515,30 +515,13 @@
|
|
|
and name like concat('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</select>
|
|
|
<select id="selectAllById" resultType="com.goafanti.organization.bo.OrganizationListOut">
|
|
|
- select
|
|
|
- a.id,
|
|
|
- a.create_id as createId,
|
|
|
- a.create_time as createTime,
|
|
|
- a.update_time as updateTime,
|
|
|
- a.deleted_sign as deletedSign,
|
|
|
- a.name,
|
|
|
- a.type,
|
|
|
- a.manager_id as managerId,
|
|
|
- a.dep_no as depNo,
|
|
|
- a.super_id as superId,
|
|
|
- a.remarks,
|
|
|
- a.status,
|
|
|
- a.abbreviation,
|
|
|
- a.finance_id financeId,
|
|
|
- a.province,
|
|
|
- c.name financeName,
|
|
|
- a.working_hours_type workingHoursType,
|
|
|
- b.name as managerName
|
|
|
- from department a
|
|
|
- left join admin b on a.manager_id = b.id
|
|
|
- left join admin c on a.finance_id = c.id
|
|
|
- where
|
|
|
- a.id=#{id,jdbcType=VARCHAR}
|
|
|
+ select a.id, a.create_id as createId, a.create_time as createTime, a.update_time as updateTime,
|
|
|
+ a.deleted_sign as deletedSign, a.name, a.type, a.manager_id as managerId, a.dep_no as depNo,
|
|
|
+ a.super_id as superId, a.remarks, a.status, a.abbreviation, a.finance_id financeId,
|
|
|
+ a.province, c.name financeName, a.working_hours_type workingHoursType, b.name as managerName
|
|
|
+ from department a
|
|
|
+ left join admin b on a.manager_id = b.id left join admin c on a.finance_id = c.id
|
|
|
+ where a.id=#{id,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
<delete id="deleteById" parameterType="java.lang.String">
|
|
|
delete from department
|
|
|
@@ -669,8 +652,7 @@
|
|
|
</if>
|
|
|
group by a.aid ) y on x.aid=y.aid)b on a.id=b.aid
|
|
|
left join department d on a.department_id=d.id
|
|
|
- left join user_role e on a.id=e.uid left join (select id from `role`where role_type in(96,996)) f on e.rid=f.id
|
|
|
- where a.status='正常'
|
|
|
+ where a.status='正常' and a.type=1
|
|
|
<if test="adminName !=null">
|
|
|
and a.name like concat('%',#{adminName},'%')
|
|
|
</if>
|