From 1fe3d312acbfb69f3bd74b21ea682512091a546f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 15:34:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w
---
src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml | 4 ++++
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java | 2 ++
src/main/java/org/springblade/modules/revoke/entity/Revoke.java | 5 +++++
src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml | 4 ++++
src/main/java/org/springblade/modules/record/entity/Record.java | 4 ++++
src/main/java/org/springblade/modules/recordk/entity/Recordk.java | 5 +++++
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml | 4 ++++
7 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
index a8b2eeb..354a96c 100644
--- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -96,6 +96,7 @@
param.put(TokenConstant.DETAIL, userInfo.getDetail());
param.put("jurisdiction", user.getJurisdiction());
param.put("cardid", user.getCardid());
+ param.put("Id", user.getId());
//拼装accessToken
try {
@@ -108,6 +109,7 @@
.set(TokenConstant.ROLE_ID, user.getRoleId())
.set("jurisdiction", user.getJurisdiction())
.set("cardid", user.getCardid())
+ .set("Id", user.getId())
.set(TokenConstant.OAUTH_ID, userInfo.getOauthId())
.set(TokenConstant.ACCOUNT, user.getAccount())
.set(TokenConstant.USER_NAME, user.getAccount())
diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index 5d85f08..3bfb8e4 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -156,6 +156,10 @@
private Date permitime;
private String reason;
private String examinetime;
+ private String cardid;
+ private String representativecell;
+ private String contacts;
+ private String contactscell;
}
diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index 8fac902..83d094b 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -27,6 +27,10 @@
<result column="permitime" property="permitime"/>
<result column="ptype" property="ptype"/>
<result column="examinetime" property="examinetime"/>
+ <result column="cardid" property="cardid"/>
+ <result column="representativecell" property="representativecell"/>
+ <result column="contacts" property="contacts"/>
+ <result column="contactscell" property="contactscell"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
index e3b13df..aa98a8a 100644
--- a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
+++ b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
@@ -154,5 +154,10 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date permitime;
private String reason;
+ private String cardid;
+ private String representativecell;
+ private String contacts;
+ private String contactscell;
+
}
diff --git a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
index 4e5489d..23cd45d 100644
--- a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
+++ b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
@@ -26,6 +26,10 @@
<result column="deptid" property="deptid"/>
<result column="permitime" property="permitime"/>
<result column="ptype" property="ptype"/>
+ <result column="cardid" property="cardid"/>
+ <result column="representativecell" property="representativecell"/>
+ <result column="contacts" property="contacts"/>
+ <result column="contactscell" property="contactscell"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/revoke/entity/Revoke.java b/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
index d645574..c2721d5 100644
--- a/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
+++ b/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -140,4 +140,9 @@
private Date permitime;
private String deptid;
private String ptype;
+ private String cardid;
+ private String representativecell;
+ private String contacts;
+ private String contactscell;
+
}
diff --git a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
index d8b8ad2..48fa53d 100644
--- a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
+++ b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -25,6 +25,10 @@
<result column="deptid" property="deptid"/>
<result column="permitime" property="permitime"/>
<result column="ptype" property="ptype"/>
+ <result column="cardid" property="cardid"/>
+ <result column="representativecell" property="representativecell"/>
+ <result column="contacts" property="contacts"/>
+ <result column="contactscell" property="contactscell"/>
</resultMap>
--
Gitblit v1.9.3