From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Controller/Base/BaseController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Controller/Base/BaseController.java b/src/main/java/com/gk/hotwork/Controller/Base/BaseController.java
index 498a9ee..c2d141f 100644
--- a/src/main/java/com/gk/hotwork/Controller/Base/BaseController.java
+++ b/src/main/java/com/gk/hotwork/Controller/Base/BaseController.java
@@ -94,6 +94,11 @@
user.setRealname(jo.getString("realname"));
user.setType(jo.getInteger("type"));
user.setCompanyid(jo.getLong("companyid"));
+ user.setCompany(jo.getString("company"));
+ user.setProvince(jo.getString("province"));
+ user.setCity(jo.getString("city"));
+ user.setCounty(jo.getString("county"));
+ user.setProfessionalLevel(jo.getInteger("professionalLevel"));
user.setDepartment(jo.getLong("department"));
user.setDepartmentname(jo.getString("departmentname"));
return user;
@@ -110,6 +115,13 @@
msg.setMessage("success");
return msg;
}
+
+ public Msg failed(String errorMsg) {
+ Msg msg = new Msg();
+ msg.setCode("500");
+ msg.setMessage(errorMsg);
+ return msg;
+ }
public Msg success(Object object) {
Msg msg = new Msg();
--
Gitblit v1.9.2