修改部门 仓库bug

master
wangwei 2 years ago
parent 9cce01e788
commit 0e502f8666

@ -264,7 +264,7 @@ public class SysUserController extends BaseController {
userService.updateAuthAdmin(authAdmin); userService.updateAuthAdmin(authAdmin);
//默认插入第一部门 //默认插入第一部门
List<Long> deptCodeList = null; ArrayList<Long> deptCodeList = new ArrayList<>();
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setUserId(authUserSaveRequest.getId()); filterDeptUserReqeust.setUserId(authUserSaveRequest.getId());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);

@ -22,4 +22,5 @@ public class InvSubWarehouseResponse {
private String parentCode; private String parentCode;
private String parentInvName; private String parentInvName;
private Integer advanceType; private Integer advanceType;
private Boolean spUse;
} }

@ -18,7 +18,7 @@
AND userFlag = #{userFlag} AND userFlag = #{userFlag}
</if> </if>
<if test="userName != null and '' != userName"> <if test="userName != null and '' != userName">
AND userName LIKE CONCAT(#{userName}, '%') AND userName LIKE CONCAT('%', #{userName}, '%')
</if> </if>
<if test="neUserName != null and '' != neUserName"> <if test="neUserName != null and '' != neUserName">
AND userName != #{neUserName} AND userName != #{neUserName}

@ -50,9 +50,9 @@
auth_dept.`name` deptName, auth_dept.`name` deptName,
auth_user.comments auth_user.comments
FROM auth_dept_user FROM auth_dept_user
INNER JOIN auth_user right JOIN auth_user
on auth_dept_user.userId = auth_user.id on auth_dept_user.userId = auth_user.id
INNER JOIN auth_dept on auth_dept_user.deptId = auth_dept.id left JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
<where> <where>
<if test="deptId != null"> <if test="deptId != null">
and deptId = #{deptId} and deptId = #{deptId}
@ -65,6 +65,7 @@
auth_user.employeeName like concat('%', #{key}, '%')) auth_user.employeeName like concat('%', #{key}, '%'))
</if> </if>
</where> </where>
group by auth_dept_user.userId
</select> </select>

@ -216,6 +216,9 @@
<if test="advanceType != null"> <if test="advanceType != null">
advanceType=#{advanceType}, advanceType=#{advanceType},
</if> </if>
<if test="spUse != null">
spUse=#{spUse},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -280,7 +283,8 @@
a.thirdId4, a.thirdId4,
b.name as parentName, b.name as parentName,
a.parentCode, a.parentCode,
c.name parentInvName c.name parentInvName,
a.spUse
FROM auth_warehouse a FROM auth_warehouse a
left join auth_dept b on a.parentId = b.code left join auth_dept b on a.parentId = b.code
left join auth_warehouse c on a.parentCode = c.code left join auth_warehouse c on a.parentCode = c.code

@ -286,6 +286,7 @@
AND (auth_user.employeeName = #{key} or auth_warehouse_user.userName = #{key}) AND (auth_user.employeeName = #{key} or auth_warehouse_user.userName = #{key})
</if> </if>
</where> </where>
GROUP BY auth_warehouse_user.userId
</select> </select>

Loading…
Cancel
Save