Commit 3a2cb836 authored by tangwei's avatar tangwei

修改bug

parent 58352b4d
...@@ -253,7 +253,7 @@ public class OrgPersonController extends BaseController { ...@@ -253,7 +253,7 @@ public class OrgPersonController extends BaseController {
Map<String, Object> req = new HashMap<>(); Map<String, Object> req = new HashMap<>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String bizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode(); String bizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
req.put("bizOrgCode", bizOrgCode); req.put("OrgCode", bizOrgCode);
// if(redisUtils.get("userList:" + bizOrgCode) != null){ // if(redisUtils.get("userList:" + bizOrgCode) != null){
// return ResponseHelper.buildResponse(redisUtils.get("userList:" + bizOrgCode)); // return ResponseHelper.buildResponse(redisUtils.get("userList:" + bizOrgCode));
// } // }
......
...@@ -676,7 +676,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -676,7 +676,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
} }
public IPage<Map<String, Object>> listAllByCurrentUser(String pageNum, String pageSize, Map<String, Object> req) { public IPage<Map<String, Object>> listAllByCurrentUser(String pageNum, String pageSize, Map<String, Object> req) {
String bizOrgCode = req.get("bizOrgCode").toString();
IPage<Map<String, Object>> pageBean = null; IPage<Map<String, Object>> pageBean = null;
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) { if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
pageBean = new Page<>(0, Long.MAX_VALUE); pageBean = new Page<>(0, Long.MAX_VALUE);
...@@ -3173,7 +3173,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3173,7 +3173,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName()); dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
} }
if ("positionType".equals(dynamicFormInstance.getFieldCode()) && peopleInfoDto.getFirefighters().getJobTitleCode() != null){ if ("positionType".equals(dynamicFormInstance.getFieldCode()) && peopleInfoDto.getFirefighters().getJobTitleCode() != null){
dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(peopleInfoDto.getFirefighters().getJobTitleCode()).getName()); dynamicFormInstance.setFieldValueLabel(peopleInfoDto.getFirefighters().getJobTitle());
} }
if ("administrativePositionCode".equals(dynamicFormInstance.getFieldCode()) && firefightersPost.getAdministrativePositionCode() != null){ if ("administrativePositionCode".equals(dynamicFormInstance.getFieldCode()) && firefightersPost.getAdministrativePositionCode() != null){
dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(map1.get("administrativePositionCode").toString()).getName()); dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(map1.get("administrativePositionCode").toString()).getName());
......
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