wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

优化BUG 人员类型不显示

dev
xiepeng 2024-05-23 15:56:56 +08:00
parent eae9b520d2
commit 6eed001b1a
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
View File

@ -221,9 +221,6 @@ public class OperatingVehiclesController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd);
List<PageData> varList = operatingVehiclesService.list(page); //列出Question列表
List<PageData> dataInfo = new ArrayList<>();
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);

22
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -760,12 +760,14 @@ public class UsersController extends BaseController {
@RequestMapping(value = "/hasEmail")
@ResponseBody
public Object hasEmail() throws Exception {
Map<String, String> map = new HashMap<String, String>();
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (usersService.findByEmail(pd) != null) {
errInfo = "fail";
PageData byEmail = usersService.findByEmail(pd);
if (!ObjectUtil.isEmpty(byEmail)) {
map.put("pd", byEmail);
map.put("result", errInfo);
}
map.put("result", errInfo); //返回结果
return map;
@ -2767,6 +2769,12 @@ public class UsersController extends BaseController {
if (pd.getString("PASSWORD") != null && !"".equals(pd.getString("PASSWORD"))) {
pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString());
}
if(!StringUtils.isEmpty(pd.getString("periodStr"))) {
String[] periodStrs = pd.getString("periodStr").split(",");
pd.put("DURATION", periodStrs[0]);
pd.put("WORKSTATUS", periodStrs[1]);
pd.put("WORKPERIOD", periodStrs[2]);
}
usersService.editUser(pd); //执行修改
if ("true".equals(pd.getString("ISSTUDENT"))) {
/*if (!IdcardUtils.validateCard(pd.getString("USER_ID_CARD"))) {
@ -3028,8 +3036,12 @@ public class UsersController extends BaseController {
userCorpList.get(0).put("ENTRY_DATE", pd.getString("ENTRY_DATE"));
userCorpList.get(0).put("SHIFTDUTYONE", pd.getString("SHIFTDUTYONE"));
userCorpList.get(0).put("SHIFTDUTYTWO", pd.getString("SHIFTDUTYTWO"));
if(!StringUtils.isEmpty(pd.getString("periodStr"))) {
String[] periodStrs = pd.getString("periodStr").split(",");
userCorpList.get(0).put("DURATION", periodStrs[0]);
userCorpList.get(0).put("WORKSTATUS", periodStrs[1]);
userCorpList.get(0).put("WORKPERIOD", periodStrs[2]);
}
}
}
userCorpService.edit(userCorpList.get(0));