|
@@ -99,20 +99,19 @@ public class JobUserServiceImpl implements JobUserService {
|
|
|
|
|
|
List<JobUserVo> dataList = jobUserCQuery.getJobUserDataList(jobUserName);
|
|
List<JobUserVo> dataList = jobUserCQuery.getJobUserDataList(jobUserName);
|
|
|
|
|
|
- for (JobUserVo dataBaseItem: dataList) {
|
|
|
|
- SelectProps itemResult = new SelectProps();
|
|
|
|
- itemResult.setText(dataBaseItem.getName());
|
|
|
|
- itemResult.setValue(dataBaseItem.getJobUserID());
|
|
|
|
|
|
+ for (JobUserVo curDataBaseItem: dataList) {
|
|
|
|
+
|
|
for(JobUserVo curJobUserItem : resultList){
|
|
for(JobUserVo curJobUserItem : resultList){
|
|
- if(curJobUserItem.getName().equals(dataBaseItem.getName())){
|
|
|
|
|
|
+
|
|
|
|
+ if(curJobUserItem.getName().equals(curDataBaseItem.getName())){
|
|
PcJobuserExample jobuserExp = new PcJobuserExample();
|
|
PcJobuserExample jobuserExp = new PcJobuserExample();
|
|
jobuserExp.or().andJobuserIDEqualTo(curJobUserItem.getJobUserID());
|
|
jobuserExp.or().andJobuserIDEqualTo(curJobUserItem.getJobUserID());
|
|
var curJobUser = pcJobuserMapper.selectByExample(jobuserExp).get(0);
|
|
var curJobUser = pcJobuserMapper.selectByExample(jobuserExp).get(0);
|
|
curJobUserItem.setName(curJobUser.getName()+desUtils.decoderText(curJobUser.getUserMobile()).substring(7,11));
|
|
curJobUserItem.setName(curJobUser.getName()+desUtils.decoderText(curJobUser.getUserMobile()).substring(7,11));
|
|
- itemResult.setText(dataBaseItem.getName()+dataBaseItem.getUserMobile().substring(7,11));
|
|
|
|
|
|
+ curDataBaseItem.setName(curDataBaseItem.getName()+desUtils.decoderText(curDataBaseItem.getUserMobile()).substring(7,11));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- resultList.add(dataBaseItem);
|
|
|
|
|
|
+ resultList.add(curDataBaseItem);
|
|
}
|
|
}
|
|
PageInfo<JobUserVo> result = new PageInfo(resultList);
|
|
PageInfo<JobUserVo> result = new PageInfo(resultList);
|
|
|
|
|