合并冲突

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -15,6 +15,7 @@ import cn.ezhizao.project.system.domain.SysRole;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.*;
 import cn.ezhizao.project.tenant.domain.BizUserTenant;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -117,9 +118,12 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @PostMapping("/getUsersItemByDeptId")
-    public TableDataInfo getUsersItemByDeptId(@RequestBody SysUser sysUser) {
+    public TableDataInfo getUsersItemByDeptId(@RequestBody Map<String, Object> data) {
         startPage();
-        List<SysUser> list = userService.selectUserItemByDeptId(sysUser);
+        Long deptId = Long.parseLong(data.get("deptId").toString());
+        String userName = data.get("userName").toString();
+        String nickName = data.get("nickName").toString();
+        List<SysUser> list = userService.selectUserItemByDeptId(deptId, userName, nickName);
         List<SysUser> distinct = list.stream().distinct().collect(Collectors.toList());
         return getDataTable(distinct);
     }
@@ -309,7 +313,7 @@ public class SysUserController extends BaseController {
     }
 
     /**
-     * 修改中间表用户是否是工段长或调机
+     * 修改中间表用户是否是工段长或调机或主管或调度
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)

src/main/java/cn/ezhizao/project/system/domain/SysDeptUser.java

@@ -45,28 +45,28 @@ public class SysDeptUser extends BaseEntity {
     /**
      * 是否主管
      * */
-    private Boolean isLeader;
+    private String isLeader;
 
     /**
      * 是否兼职
      * */
-    private Boolean isPartTime;
+    private String isPartTime;
 
 
     /**
      * 是否调度
      * */
-    private Boolean isDispatcher;
+    private String isDispatcher;
 
     /**
      * 是否工段长
      * */
-    private Integer isFormman;
+    private String isFormman;
 
     /**
      * 是否调机
      * */
-    private Integer isYardman;
+    private String isYardman;
 
     private Integer deleted;
     /**

src/main/java/cn/ezhizao/project/system/domain/SysUser.java

@@ -124,44 +124,44 @@ public class SysUser extends BaseEntity {
      */
     private Long[] postIds;
 
-    private Integer isLeader;
-    private Integer isPartTime;
-    private Integer isDispatcher;
-    private Integer isFormman;
-    private Integer isYardman;
+    private String isLeader;
+    private String isPartTime;
+    private String isDispatcher;
+    private String isFormman;
+    private String isYardman;
     private Integer isEdit;
 
-    public Integer getIsLeader() {
+    public String getIsLeader() {
         return isLeader;
     }
-    public void setIsLeader(Integer leader) {
+    public void setIsLeader(String leader) {
         isLeader = leader;
     }
-    public Integer getIsPartTime() {
+    public String getIsPartTime() {
         return isPartTime;
     }
-    public void setIsPartTime(Integer partTime) {
+    public void setIsPartTime(String partTime) {
         isPartTime = partTime;
     }
-    public Integer getIsDispatcher() {
+    public String getIsDispatcher() {
         return isDispatcher;
     }
-    public void setIsDispatcher(Integer dispatcher) {
+    public void setIsDispatcher(String dispatcher) {
         isDispatcher = dispatcher;
     }
-    public Integer getIsFormman() {
+    public String getIsFormman() {
         return isFormman;
     }
 
-    public void setIsFormman(Integer formman) {
+    public void setIsFormman(String formman) {
         isFormman = formman;
     }
 
-    public Integer getIsYardman() {
+    public String getIsYardman() {
         return isYardman;
     }
 
-    public void setIsYardman(Integer yardman) {
+    public void setIsYardman(String yardman) {
         isYardman = yardman;
     }
 

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -161,8 +161,8 @@ public interface SysUserMapper {
 
     /**
      * 根据工段id获取用户信息
-     * @param sysUser 用户信息
+     * @param deptId,username,nickname 用户信息
      * @return 用户信息
      */
-    public List<SysUser> selectUserItemByDeptId(SysUser sysUser);
+    public List<SysUser> selectUserItemByDeptId(@Param("deptId") Long deptId,@Param("userName") String userName,@Param("nickName") String nickName);
 }

src/main/java/cn/ezhizao/project/system/service/ISysUserService.java

@@ -249,5 +249,5 @@ public interface ISysUserService
      * @param sysUser 用户信息
      * @return 用户信息
      */
-    List<SysUser> selectUserItemByDeptId(SysUser sysUser);
+    List<SysUser> selectUserItemByDeptId(Long deptId,String userName,String nickName);
 }

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -560,7 +560,7 @@ public class SysUserServiceImpl implements ISysUserService {
     }
 
     @Override
-    public List<SysUser> selectUserItemByDeptId(SysUser sysUser) {
-        return userMapper.selectUserItemByDeptId(sysUser);
+    public List<SysUser> selectUserItemByDeptId(Long deptId,String userName,String nickName) {
+        return userMapper.selectUserItemByDeptId(deptId,userName,nickName);
     }
 }

src/main/resources/mybatis/system/SysDeptUserMapper.xml

@@ -56,8 +56,10 @@
     <update id="updateDeptUser" parameterType="SysDeptUser">
         update sys_dept_user
         set is_formman = #{isFormman},
-            is_yardman = #{isYardman}
-        where user_id = #{userId}
-          and dept_id = #{deptId}
+            is_yardman = #{isYardman},
+            is_leader = #{isLeader},
+            is_dispatcher = #{isDispatcher}
+        where  user_id = #{userId} and
+               dept_id = #{deptId}
     </update>
 </mapper>

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -61,7 +61,8 @@
             deptUser.is_part_time,
             deptUser.is_dispatcher,
 			deptUser.is_formman,
-			deptUser.is_yardman
+			deptUser.is_yardman,
+		    deptUser.id
         FROM sys_user u
 		JOIN (SELECT * FROM sys_dept_user WHERE deleted = 0 AND dept_id in
 		<foreach collection="ids" item="deptId" open="(" separator="," close=")">
@@ -73,7 +74,7 @@
 			u.user_type = '02'
     </select>
 
-	<select id="selectUserItemByDeptId" parameterType="SysUser" resultMap="SysUserResult">
+	<select id="selectUserItemByDeptId"  resultMap="SysUserResult">
 		SELECT u.* FROM sys_user u right join sys_dept_user d on u.user_id = d.user_id
 		WHERE u.del_flag = '0' AND d.deleted ='0' AND u.user_type = '02'
 		<if test="userName != null and userName != ''">