From 341d34aab4bbe6fc2ed0920c335b1f5784f2db9c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 19:25:05 +0800
Subject: [PATCH] 接收人员查询，派遣列表app端接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 814d594..7f854b8 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -347,7 +347,8 @@
//设置账号
user.setAccount(user.getCardid());
//获取默认密码配置
- user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+ user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
+// user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
//新增
this.submit(user);
});
@@ -591,7 +592,8 @@
//设置账号
user.setAccount(user.getCardid());
//获取默认密码配置
- user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+ user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
+// user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
//新增
this.submit(user);
});
@@ -621,6 +623,15 @@
@Override
public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction) {
- return baseMapper.seleL(type,deptid, jurisdiction);
+ List<Map<String, Object>> list = new ArrayList<>();
+ //工作汇报
+ if (type.equals(1)){
+ list = baseMapper.getDispaterInfo(deptid, jurisdiction);
+ }
+ //派遣
+ if (type.equals(2) ||type.equals(3)){
+ list = baseMapper.getWorkReportInfo(type,deptid, jurisdiction);
+ }
+ return list;
}
}
--
Gitblit v1.9.3