luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复，项目管理接口逻辑完善

Browse Source
This commit is contained in:
mi9688
2024-10-31 17:51:50 +08:00
parent 502a785d3b
commit 318cee69c1
8 changed files with 99 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />
<result property="deptUserId" column="dept_user_id" />
<result property="deptUserId" column="dept_user_id" />
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
<result property="deptName" column="dept_name" />
@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDeptVo">
select d.dept_id, d.dept_user_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.dept_type
select d.dept_id, d.dept_user_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.dept_type,d.administrative_level
from sys_dept d
</sql>
@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dept_type, d.dept_user_id,d.administrative_area_code,
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dept_type, d.dept_user_id,d.administrative_level,d.administrative_area_code,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
where d.dept_id = #{deptId}
@ -178,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="townCode != null">town_code,</if>
<if test="villageCode != null">village_code,</if>
<if test="projectId != null">project_id,</if>
<if test="administrativeLevel != null">administrative_level,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deptUserId != null">#{deptUserId},</if>
@ -203,6 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="townCode != null">#{townCode},</if>
<if test="villageCode != null">#{villageCode},</if>
<if test="projectId != null">#{projectId},</if>
<if test="administrativeLevel != null">#{administrativeLevel},</if>
</trim>
</insert>
@ -250,6 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="townCode != null">town_code = #{townCode},</if>
<if test="villageCode != null">village_code = #{villageCode},</if>
<if test="projectId != null">project_id = #{projectId},</if>
<if test="administrativeLevel != null">administrative_level = #{administrativeLevel},</if>
</trim>
where dept_id = #{deptId}
</update>