Commit 4f95525d authored by fangxinjiang's avatar fangxinjiang

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

parents 3f8916a8 60c8f533
...@@ -138,7 +138,7 @@ public class TCompleteMonitorSetServiceImpl extends ServiceImpl<TCompleteMonitor ...@@ -138,7 +138,7 @@ public class TCompleteMonitorSetServiceImpl extends ServiceImpl<TCompleteMonitor
} }
} }
if (Common.isNotNull(curContractType)) { if (Common.isNotNull(curContractType)) {
return R.failed("员工合同类型“" + curContractType + "”已存在"); return R.failed("员工合同类型已存在");
} }
} }
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
......
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
* @date 2025-02-25 14:48:11 * @date 2025-02-25 14:48:11
*/ */
@Data @Data
@ColumnWidth(12) @ColumnWidth(15)
public class EmployeeRegistrationExportVo implements Serializable { public class EmployeeRegistrationExportVo implements Serializable {
@ExcelAttribute(name = "员工姓名") @ExcelAttribute(name = "员工姓名")
......
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
* @date 2025-02-25 14:48:11 * @date 2025-02-25 14:48:11
*/ */
@Data @Data
@ColumnWidth(12) @ColumnWidth(15)
public class EmployeeRegistrationHrExportVo implements Serializable { public class EmployeeRegistrationHrExportVo implements Serializable {
@ExcelAttribute(name = "项目编码") @ExcelAttribute(name = "项目编码")
......
...@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept; ...@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
...@@ -102,6 +103,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -102,6 +103,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
*/ */
@Override @Override
public IPage<EmployeeRegistration> getHrEmployeeRegistrationPage(Page<EmployeeRegistration> page, EmployeeRegistrationSearchVo employeeRegistration) { public IPage<EmployeeRegistration> getHrEmployeeRegistrationPage(Page<EmployeeRegistration> page, EmployeeRegistrationSearchVo employeeRegistration) {
YifuUser user = SecurityUtils.getUser();
long roleId = 1839501715787390978L;
boolean isSsc = this.haveRole(user, roleId);
if (isSsc) {
employeeRegistration.setCustomerUserLoginname(null);
}
return baseMapper.getEmployeeRegistrationPage(page, employeeRegistration); return baseMapper.getEmployeeRegistrationPage(page, employeeRegistration);
} }
...@@ -516,6 +523,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -516,6 +523,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (!wxConfig.sendTextCard(restTemplate, requestMap)) { if (!wxConfig.sendTextCard(restTemplate, requestMap)) {
wxConfig.sendTextCard(restTemplate, requestMap); wxConfig.sendTextCard(restTemplate, requestMap);
} }
//企业微信发送记录
logService.saveLog(user.getUserId(), CommonConstants.ZERO_STRING,"企业微信消息提醒", LocalDateTime.now(),
registration.getRegistorUsername(),"提醒人:" + user.getNickname());
} }
} }
...@@ -601,4 +611,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -601,4 +611,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
} }
} }
public boolean haveRole(YifuUser user, long roleId) {
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
for (Long role : roleList) {
if (role == roleId) {
return true;
}
}
return false;
}
} }
...@@ -561,6 +561,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl ...@@ -561,6 +561,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
*/ */
@Override @Override
public R<String> removeCspDeptById(Long deptId) { public R<String> removeCspDeptById(Long deptId) {
SysDept findInfo = baseMapper.selectById(deptId);
if (Common.isEmpty(findInfo)) {
return R.failed("部门未找到");
}
int hasChild = baseMapper.hasChildByDeptId(deptId); int hasChild = baseMapper.hasChildByDeptId(deptId);
if (hasChild > 0) { if (hasChild > 0) {
return R.failed("存在下级部门,不允许删除"); return R.failed("存在下级部门,不允许删除");
...@@ -570,8 +574,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl ...@@ -570,8 +574,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
return R.failed("部门下仍然有员工,请调出所有员工后,删除部门"); return R.failed("部门下仍然有员工,请调出所有员工后,删除部门");
} }
this.removeById(deptId); this.removeById(deptId);
// 清理用户权限,重新获取用户的部门权限
List<String> userNames = sysUserMapper.getCspUserByDeptId(deptId.toString()); // 清理用户权限,重新获取项目下的用户的部门权限
List<String> userNames = sysUserMapper.getCspUserByProjectNo(findInfo.getProjectNo());
if (Common.isNotNull(userNames)){ if (Common.isNotNull(userNames)){
for (String us:userNames){ for (String us:userNames){
redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ us); redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ us);
...@@ -623,8 +628,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl ...@@ -623,8 +628,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
baseMapper.updateById(updateEntity); baseMapper.updateById(updateEntity);
List<DeptSortVo> moveVos = dept.getDeptSortList(); List<DeptSortVo> moveVos = dept.getDeptSortList();
baseMapper.batchUpdateSort(moveVos); baseMapper.batchUpdateSort(moveVos);
//清理用户权限 // 清理用户权限
List<String> userNames = sysUserMapper.getCspUserByDeptId(dept.getDeptId()); // List<String> userNames = sysUserMapper.getCspUserByDeptId(dept.getDeptId());
List<String> userNames = sysUserMapper.getCspUserByProjectNo(updateEntity.getProjectNo());
if (Common.isNotNull(userNames)){ if (Common.isNotNull(userNames)){
for (String us:userNames){ for (String us:userNames){
redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ us); redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ us);
......
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