elink-star
/
esua-epdc-js
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PC端用户管理修改支持关联多个部门

feature/syp_points
liuchuang 5 years ago
parent
97d01efd98
commit
8ea2043bed
9 changed files with 80 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
  2. 11
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptDTO.java
  3. 18
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptInfoDTO.java
  4. 15
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserDeptEntity.java
  5. 4
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserDeptService.java
  6. 23
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserDeptServiceImpl.java
  7. 10
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
  8. 2
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
  9. 27
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDeptDao.xml

18
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
View File

@ -110,13 +110,23 @@ public class SysUserDTO implements Serializable {
private String scrip;
/**
* 关联部门ID
* 关联工作人员部门ID
*/
private Long relationDeptId;
private Long relationWorkDeptId;
/**
* 关联部门名称
* 关联工作人员部门名称
*/
private String relationDeptName;
private String relationWorkDeptName;
/**
* 关联领导干部部门ID
*/
private Long relationLeaderDeptId;
/**
* 关联领导干部部门名称
*/
private String relationLeaderDeptName;
}

11
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptDTO.java
View File

@ -44,9 +44,14 @@ public class SysUserDeptDTO implements Serializable {
private Long userId;
/**
* 部门ID
* 关联工作人员网格ID
*/
private Long deptId;
private Long relationWorkDeptId;
/**
* 关联领导干部网格ID
*/
private Long relationLeaderDeptId;
/**
* 删除标识 0：未删除 1：删除
@ -73,4 +78,4 @@ public class SysUserDeptDTO implements Serializable {
*/
private Date updateDate;
}
}

18
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptInfoDTO.java
View File

@ -14,12 +14,22 @@ public class SysUserDeptInfoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 关联部门ID
* 关联工作人员网格ID
*/
private Long relationDeptId;
private Long relationWorkDeptId;
/**
* 关联部门名称
* 关联工作人员网格名称
*/
private String relationDeptName;
private String relationWorkDeptName;
/**
* 关联领导干部网格ID
*/
private Long relationLeaderDeptId;
/**
* 关联领导干部网格名称
*/
private String relationLeaderDeptName;
}

15
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserDeptEntity.java
View File

@ -46,10 +46,15 @@ public class SysUserDeptEntity extends BaseEntity {
*/
private Long userId;
/**
* 部门ID
*/
private Long deptId;
/**
* 关联工作人员网格ID
*/
private Long relationWorkDeptId;
/**
* 关联领导干部网格ID
*/
private Long relationLeaderDeptId;
/**
* 删除标识 0：未删除 1：删除
@ -70,4 +75,4 @@ public class SysUserDeptEntity extends BaseEntity {
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateDate;
}
}

4
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserDeptService.java
View File

@ -104,7 +104,7 @@ public interface SysUserDeptService extends BaseService<SysUserDeptEntity> {
* @author liuchuang
* @since 2020/7/29 15:56
*/
void saveOrUpdateUserDeptInfo(Long userId, Long deptId);
void saveOrUpdateUserDeptInfo(Long userId, Long relationWorkDeptId, Long relationLeaderDeptId);
/**
*
@ -116,4 +116,4 @@ public interface SysUserDeptService extends BaseService<SysUserDeptEntity> {
* @since 2020/7/29 16:19
*/
SysUserDeptInfoDTO getUserDeptInfoByUserId(Long userId);
}
}

23
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserDeptServiceImpl.java
View File

@ -28,7 +28,6 @@ import com.elink.esua.epdc.dao.SysUserDeptDao;
import com.elink.esua.epdc.dto.SysUserDeptDTO;
import com.elink.esua.epdc.dto.SysUserDeptInfoDTO;
import com.elink.esua.epdc.entity.SysUserDeptEntity;
import com.elink.esua.epdc.entity.SysUserEntity;
import com.elink.esua.epdc.redis.SysUserDeptRedis;
import com.elink.esua.epdc.service.SysUserDeptService;
import org.apache.commons.lang3.StringUtils;
@ -106,22 +105,26 @@ public class SysUserDeptServiceImpl extends BaseServiceImpl<SysUserDeptDao, SysU
@Override
@Transactional(rollbackFor = Exception.class)
public void saveOrUpdateUserDeptInfo(Long userId, Long deptId) {
if (null != userId && null != deptId) {
public void saveOrUpdateUserDeptInfo(Long userId, Long relationWorkDeptId, Long relationLeaderDeptId) {
if (null != userId) {
QueryWrapper<SysUserDeptEntity> wrapper = new QueryWrapper<>();
wrapper.eq(FieldConstant.USER_ID, userId)
.eq(FieldConstant.DEL_FLAG, DelFlagEnum.NORMAL.value());
SysUserDeptEntity userDeptEntity = baseDao.selectOne(wrapper);
if (null != userDeptEntity) {
userDeptEntity.setUserId(userId);
userDeptEntity.setDeptId(deptId);
userDeptEntity.setRelationWorkDeptId(relationWorkDeptId);
userDeptEntity.setRelationLeaderDeptId(relationLeaderDeptId);
updateById(userDeptEntity);
baseDao.updateRelationDeptInfoByUserId(userId, relationWorkDeptId, relationLeaderDeptId);
} else {
SysUserDeptEntity entity = new SysUserDeptEntity();
entity.setUserId(userId);
entity.setDeptId(deptId);
insert(entity);
if (null != relationWorkDeptId || null != relationLeaderDeptId) {
SysUserDeptEntity entity = new SysUserDeptEntity();
entity.setUserId(userId);
entity.setRelationWorkDeptId(relationWorkDeptId);
entity.setRelationLeaderDeptId(relationLeaderDeptId);
insert(entity);
}
}
}
}
@ -131,4 +134,4 @@ public class SysUserDeptServiceImpl extends BaseServiceImpl<SysUserDeptDao, SysU
return baseDao.selectUserDeptInfoByUserId(userId);
}
}
}

10
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
View File

@ -105,8 +105,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
// 获取用户关联部门信息
SysUserDeptInfoDTO sysUserDeptInfoDto = sysUserDeptService.getUserDeptInfoByUserId(id);
if (null != sysUserDeptInfoDto) {
dto.setRelationDeptId(sysUserDeptInfoDto.getRelationDeptId());
dto.setRelationDeptName(sysUserDeptInfoDto.getRelationDeptName());
dto.setRelationWorkDeptId(sysUserDeptInfoDto.getRelationWorkDeptId());
dto.setRelationWorkDeptName(sysUserDeptInfoDto.getRelationWorkDeptName());
dto.setRelationLeaderDeptId(sysUserDeptInfoDto.getRelationLeaderDeptId());
dto.setRelationLeaderDeptName(sysUserDeptInfoDto.getRelationLeaderDeptName());
}
return dto;
@ -138,7 +140,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
sysRoleUserService.saveOrUpdate(entity.getId(), dto.getRoleIdList());
// 保存/更新用户关联部门信息
sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationDeptId());
sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationWorkDeptId(), dto.getRelationLeaderDeptId());
}
@ -165,7 +167,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
sysRoleUserService.saveOrUpdate(entity.getId(), dto.getRoleIdList());
// 保存/更新用户关联部门信息
sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationDeptId());
sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationWorkDeptId(), dto.getRelationLeaderDeptId());
}
/**

2
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
View File

@ -178,7 +178,7 @@
u.scrip
from sys_user u
LEFT JOIN sys_user_dept ud ON u.id = ud.user_id AND ud.del_flag = '0'
where u.del_flag='0' and ud.dept_id=#{gridId} and u.mobile = #{mobile}
where u.del_flag='0' and (ud.relation_work_dept_id=#{gridId} OR ud.relation_work_dept_id=#{gridId}) and u.mobile = #{mobile}
order by u.CREATE_DATE desc
limit 1
</select>

27
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDeptDao.xml
View File

@ -3,28 +3,25 @@
<mapper namespace="com.elink.esua.epdc.dao.SysUserDeptDao">
<resultMap type="com.elink.esua.epdc.entity.SysUserDeptEntity" id="sysUserDeptMap">
<result property="id" column="id"/>
<result property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<result property="delFlag" column="del_flag"/>
<result property="creator" column="creator"/>
<result property="createDate" column="create_date"/>
<result property="updater" column="updater"/>
<result property="updateDate" column="update_date"/>
</resultMap>
<select id="selectUserDeptInfoByUserId" resultType="com.elink.esua.epdc.dto.SysUserDeptInfoDTO">
SELECT
d.id relationDeptId,
d.`name` relationDeptName
d.id relationWorkDeptId,
d.`name` relationWorkDeptName,
d1.id relationLeaderDeptId,
d1.`name` relationLeaderDeptName
FROM
sys_user_dept ud
LEFT JOIN sys_dept d ON d.id = ud.dept_id
LEFT JOIN sys_dept d ON d.id = ud.relation_work_dept_id
AND d.del_flag = 0
LEFT JOIN sys_dept d1 ON d1.id = ud.relation_leader_dept_id
AND d1.del_flag = 0
WHERE
ud.del_flag = 0
AND ud.user_id = #{userId}
</select>
</mapper>
<update id="updateRelationDeptInfoByUserId">
UPDATE sys_user_dept SET relation_work_dept_id = #{relationWorkDeptId}, relation_leader_dept_id = #{relationLeaderDeptId} WHERE user_id = #{userId}
</update>
</mapper>

Write Preview
Loading…
Cancel
Save