From 084df211271b476c5d285e704e4b32f0ffb5fbe7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 23:52:58 +0800
Subject: [PATCH] 辖区接口修改，成绩计算修改，导入密码取身份证后6位
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 6 ++++--
src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml | 4 +++-
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 6 ++++++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index ca4f770..23ab21b 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -40,6 +40,9 @@
<if test="examScore.securityName!=null and examScore.securityName!=''">
and bu.real_name like concat('%', #{examScore.securityName},'%')
</if>
+ <if test="examScore.account!=null and examScore.account!=''">
+ and bu.account like concat('%', #{examScore.account},'%')
+ </if>
<if test="examScore.userId!=null and examScore.userId!=''">
and es.user_id = #{examScore.userId}
</if>
@@ -99,6 +102,9 @@
<if test="examScore.securityName!=null and examScore.securityName!=''">
and bu.real_name like concat('%', #{examScore.securityName},'%')
</if>
+ <if test="examScore.account!=null and examScore.account!=''">
+ and bu.account like concat('%', #{examScore.account},'%')
+ </if>
<if test="examScore.userId!=null and examScore.userId!=''">
and es.user_id = #{examScore.userId}
</if>
diff --git a/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml b/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
index 69f49cf..1210896 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
+++ b/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
@@ -86,10 +86,12 @@
FROM
sys_jurisdiction dept
WHERE dept.is_deleted = 0
- and dept.parent_id = #{param2}
<if test="param1!=null and param1!=''">
and dept.tenant_id = #{param1}
</if>
+ <if test="param2!=null and param2!=''">
+ and dept.parent_id = #{param2}
+ </if>
</select>
<select id="lazyTrees" resultMap="treeNodeResultMap" >
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..9f8e67a 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);
});
--
Gitblit v1.9.3