luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

组织-工作人员编辑 bug修改

master
zhaoqifeng 5 years ago
parent
cbddbbe82c
commit
cfdf7d7696
1 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

28
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
View File

@ -182,9 +182,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
List<GovStaffRoleResultDTO> gridManager = staffRoleService.listStaffsInRole(UserRoleConstant.GRID_MANAGER, customerStaffGridDTOS.get(0).getPid(), DataScope.getDefault()); List<GovStaffRoleResultDTO> gridManager = staffRoleService.listStaffsInRole(UserRoleConstant.GRID_MANAGER, customerStaffGridDTOS.get(0).getPid(), DataScope.getDefault());
List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS); List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS);
for (GovStaffRoleResultDTO govStaffRoleResultDTO : gridManager) { for (GovStaffRoleResultDTO govStaffRoleResultDTO : gridManager) {
if (govStaffRoleResultDTO.getRoleKey()==UserRoleConstant.GRID_MANAGER){ if (govStaffRoleResultDTO.getRoleKey() == UserRoleConstant.GRID_MANAGER) {
for (StaffGridListDTO staffGridListDTO : staffGridListDTOS) { for (StaffGridListDTO staffGridListDTO : staffGridListDTOS) {
if (staffGridListDTO.getStaffId()==govStaffRoleResultDTO.getStaffId()){ if (staffGridListDTO.getStaffId() == govStaffRoleResultDTO.getStaffId()) {
staffGridListDTO.setRoleName(govStaffRoleResultDTO.getRoleName()); staffGridListDTO.setRoleName(govStaffRoleResultDTO.getRoleName());
} }
break; break;
@ -316,7 +316,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
customerStaffFormDTO.setCustomerId(fromDTO.getCustomerId()); customerStaffFormDTO.setCustomerId(fromDTO.getCustomerId());
customerStaffFormDTO.setMobile(fromDTO.getMobile()); customerStaffFormDTO.setMobile(fromDTO.getMobile());
CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfo(customerStaffFormDTO); CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfo(customerStaffFormDTO);
if (!fromDTO.getStaffId().equals(customerStaffDTO.getUserId())) { if (null != customerStaffDTO && !fromDTO.getStaffId().equals(customerStaffDTO.getUserId())){
return new Result<CustomerStaffDTO>().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg()); return new Result<CustomerStaffDTO>().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg());
} }
@ -414,20 +414,20 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
return new Result<List<CustomerIdDTO>>().ok(baseDao.selectCustomerIdByUserId(addDepartmentStaffFormDTO)); return new Result<List<CustomerIdDTO>>().ok(baseDao.selectCustomerIdByUserId(addDepartmentStaffFormDTO));
} }
/** /**
* @Description 通过userId列表查询未被禁用的用户信息 * @return Result<List < CommonStaffInfoResultDTO>>
* @Param CommonUserIdListFormDTO :: getUserIdList * @Description 通过userId列表查询未被禁用的用户信息
* @return Result<List<CommonStaffInfoResultDTO>> * @Param CommonUserIdListFormDTO :: getUserIdList
* @Author wangc * @Author wangc
* @Date 2020.04.24 15:44 * @Date 2020.04.24 15:44
**/ **/
@Override @Override
public Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList) { public Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList) {
if (userIdList.getUserIdList().size() <= NumConstant.ZERO) { if (userIdList.getUserIdList().size() <= NumConstant.ZERO) {
return new Result<List<CommonStaffInfoResultDTO>>().ok(new ArrayList<>()); return new Result<List<CommonStaffInfoResultDTO>>().ok(new ArrayList<>());
} }
return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(),userIdList.getCustomerId())); return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(), userIdList.getCustomerId()));
} }
} }
Write Preview
Loading…
Cancel
Save