Commit 93d7e957 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents b7afba65 56df3788
......@@ -311,4 +311,18 @@ public class DeptController {
return sysDeptService.cspUpdateDept(dept);
}
/**
* 客户服务平台——获取项目下已删除的部门
* @return R<String> 删除部门的ID集合
* @author chenyuxi
* @since 1.9.7
*/
@GetMapping(value = "/csp/getDelDeptIds")
public R<String> cspDelDeptIds(SysDeptVo dept) {
if(Common.isEmpty(dept.getProjectNo())){
return R.failed("项目编码不能为空");
}
return R.ok(sysDeptService.cspDelDeptIds(dept.getProjectNo()));
}
}
......@@ -97,4 +97,8 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
void batchUpdateSort(@Param("moveVos")List<DeptSortVo> moveVos);
List<SysDept> cspDelDeptIds(@Param("projectNo") String projectNo);
}
......@@ -105,4 +105,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
@Param("projectNo")String projectNo);
List<String> getCspUserByDeptId(@Param("deptId")String deptId);
List<String> getCspUserByProjectNo(@Param("projectNo")String projectNo);
}
......@@ -144,4 +144,12 @@ public interface SysDeptService extends IService<SysDept> {
R<Boolean> cspUpdateDept(SysDeptMoveVo dept);
/**
* 客户服务平台——获取项目下已删除的部门
* @return R<String> 删除部门的ID集合
* @author chenyuxi
* @since 1.9.7
*/
String cspDelDeptIds(String projectNo);
}
......@@ -511,8 +511,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
}
dept.setClient(ClientNameConstants.CLIENT_CSP);
this.save(dept);
// 清理用户权限,重新获取用户的部门权限
List<String> userNames = sysUserMapper.getCspUserByDeptId(dept.getDeptId().toString());
// 清理用户权限,重新获取项目下的用户的部门权限
List<String> userNames = sysUserMapper.getCspUserByProjectNo(dept.getProjectNo());
if (Common.isNotNull(userNames)){
for (String us:userNames){
redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ us);
......@@ -630,4 +631,27 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
}
return R.ok();
}
/**
* 客户服务平台——获取项目下已删除的部门
*
* @param projectNo
* @return R<String> 删除部门的ID集合
* @author chenyuxi
* @since 1.9.7
*/
@Override
public String cspDelDeptIds(String projectNo) {
String delDeptIds = "";
List<SysDept> deptList = baseMapper.cspDelDeptIds(projectNo);
if(Common.isNotNull(deptList)){
for(SysDept dept : deptList){
delDeptIds = delDeptIds.concat(",").concat(dept.getDeptId().toString());
}
}
if(delDeptIds.length()>0){
delDeptIds = delDeptIds.substring(1);
}
return delDeptIds;
}
}
......@@ -155,4 +155,8 @@
</foreach>
</update>
<select id="cspDelDeptIds" resultType="com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept">
select dept_id from sys_dept where del_flag = '1' AND project_no = #{projectNo}
</select>
</mapper>
......@@ -448,4 +448,12 @@
where c.project_no in (SELECT project_no from sys_user_dept_permission where dept_id=#{deptId})
) and a.del_flag='0'
</select>
<select id="getCspUserByProjectNo" resultType="java.lang.String">
SELECT a.username from sys_user a
where a.user_id in (
select c.user_id from sys_user_dept_permission c
where c.project_no in (#{projectNo})
) and a.del_flag='0'
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment