@@ -96,9 +96,18 @@ public class JobUserServiceImpl implements JobUserService {
var dataList = getList(1, 99999, null, null, null, null, null, null, null, null, null, null, null, null, null).getList();
List<SelectProps> dataResult = new ArrayList<>();
for (var item: dataList) {
- SelectProps itemResult = new SelectProps();
+ SelectProps itemResult = new SelectProps();
itemResult.setText(item.getName());
itemResult.setValue(item.getJobUserID());
+ for(SelectProps curProp : dataResult){
+ if(curProp.getText().equals(item.getName())){
+ PcJobuserExample jobuserExp = new PcJobuserExample();
+ jobuserExp.or().andJobuserIDEqualTo(curProp.getValue());
+ var curJobUser = pcJobuserMapper.selectByExample(jobuserExp).get(0);
+ curProp.setText(curJobUser.getName()+desUtils.decoderText(curJobUser.getUserMobile()).substring(7,11));
+ itemResult.setText(item.getName()+item.getUserMobile().substring(7,11));
+ }
dataResult.add(itemResult);
}
return dataResult;
@@ -216,9 +216,11 @@ export default defineComponent({
const getAllSites = () => {
- getSiteList(searchParams).then((result :any) => {
+ getSiteList({
+ pageIndex:1,
+ pageSize:9999
+ }).then((result :any) => {
allSites.value = result.list;
- console.log('allSites',allSites);
})
const dataList = ref([]);