From 55549548a7a990b978b4738ee44f6525d2d33d98 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 14 Mar 2022 09:28:46 +0800
Subject: [PATCH] 首页新闻接口问题修复 注册发送登录信件
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 5 ++++-
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 1 +
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java | 1 +
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 4 ++++
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 3 +++
src/main/java/org/springblade/modules/system/controller/UserController.java | 8 +++++++-
src/main/java/org/springblade/modules/system/entity/User.java | 1 +
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 1 +
src/main/java/org/springblade/modules/system/service/IUserService.java | 1 +
9 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index 6c65ef8..064ce00 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -254,6 +254,9 @@
AND CONCAT(title,source_name)
LIKE CONCAT ('%', #{article.keyword},'%')
</if>
+ <if test="(article.rolename==null and article.rolename=='') or (article.rolename!='administrator' and article.rolename!='policeAdmin')">
+ AND publish = 1
+ </if>
and iswords = "0" and type!=1
order by create_time desc
</select>
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 6b89a19..362ce4f 100644
--- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -109,6 +109,7 @@
.set("cardid", user.getCardid())
.set("phone", user.getPhone())
.set("workjurisdiction", user.getWorkjurisdiction())
+ .set("firstlogin", user.getFirstlogin())
.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/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 75dccea..7b0a167 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -645,6 +645,12 @@
return R.data(res);
}
-
+ /**
+ * 首次登录发送祝贺信
+ */
+ @GetMapping("/firstLogin")
+ public R firstLogin(String id) {
+ return R.status(userService.firstLogin(id));
+ }
}
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 26ebbe8..52123a8 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -150,4 +150,5 @@
private String signals;
@TableField("job_unit")
private String jobUnit;
+ private String firstlogin;
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 00a496b..ad5c631 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -127,6 +127,7 @@
*/
Integer selectCountAccount(@Param("account") String account);
void updateAcc(String stype,String account);
+ boolean firstLogin(String id);
void delete(String account);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 6281d53..2fe0c3a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -452,7 +452,10 @@
</select>
<update id="updateAcc">
- update blade_user set stype=#{stype} where account=#{account}
+ update blade_user set stype=#{stype},firstlogin = "1" where account=#{account}
+ </update>
+ <update id="firstLogin">
+ update blade_user set firstlogin = "0" where id=#{id}
</update>
<delete id="delete">
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 1b26495..2a49547 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -287,6 +287,7 @@
*/
Integer selectCount(String account);
void updateAcc(String stype,String account);
+ boolean firstLogin(String id);
void delete(String account);
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 b420155..c228aab 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
@@ -540,6 +540,10 @@
public void updateAcc(String stype, String account) {
baseMapper.updateAcc(stype, account);
}
+ @Override
+ public boolean firstLogin(String id) {
+ return baseMapper.firstLogin(id);
+ }
@Override
public void delete(String account) {
diff --git a/src/main/java/org/springblade/modules/zc/controller/ZcController.java b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
index e1e4de0..7a13f9f 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -222,6 +222,7 @@
user.setWorkjurisdiction(zc.getWorkjurisdiction());
user.setExamination_type("0");
user.setExamination_mx("正常");
+ user.setFirstlogin("0");
user.setCardid(zc.getCardid());
if (!zc.getSignals().equals("")) {
user.setSignals(zc.getSignals());
--
Gitblit v1.9.3