guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

bug修复

pull/5/head
liujun 2023-12-26 12:35:28 +08:00
parent 797a8c0586
commit e1cd46b493
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.zcloud.service.xgf.impl;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.xgf.TrainUsersMapper;
import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper; import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper;
import com.zcloud.mapper.datasource.xgf.XgfUserMapper; import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.bus.CorpInfoService;
@ -28,6 +29,9 @@ public class XgfUserServiceImpl implements XgfUserService {
@Resource @Resource
private XgfUserDetailsMapper xgfUserDetailsMapper; private XgfUserDetailsMapper xgfUserDetailsMapper;
@Resource
private TrainUsersMapper trainUsersMapper;
@Resource @Resource
private DepartmentService departmentService; private DepartmentService departmentService;
@ -107,10 +111,16 @@ public class XgfUserServiceImpl implements XgfUserService {
if (regDepartmentEntity.size() > 0) { if (regDepartmentEntity.size() > 0) {
x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME"));
} }
x.put("IS_DELETE", "0"); x.put("IS_DELETE", "0");
x.put("VALID_FLAG", "1"); x.put("VALID_FLAG", "1");
x.put("STATUS", "2"); x.put("STATUS", "2");
if ("2".equals(x.getString("STUDY_STATUS"))) {
x.put("STUDY_STATUS", "2");
}else {
x.put("STUDY_STATUS", entity.getString("STUDY_STATUS"));
}
x.put("STUDY_STATUS",entity.getString("STUDY_STATUS"));
xgfUserMapper.edit(x); xgfUserMapper.edit(x);
xgfUserDetailsMapper.edit(x); xgfUserDetailsMapper.edit(x);
} }

6
src/main/resources/application-local.properties
View File

@ -65,11 +65,11 @@ preventionxgf.api.url=http://192.168.0.79:8088/
qa-regulatory-gwj.api.url=http://192.168.0.79:8092/ qa-regulatory-gwj.api.url=http://192.168.0.79:8092/
#????? #?????
smb.host=39.103.224.166 smb.host=192.168.192.201
smb.port=22 smb.port=22
smb.user=root smb.user=root
smb.password=Zcloud@zcloud88888 smb.password=SJSKAQHBGLXT@20220311
smb.basePath=/mnt/qgfile/file/ smb.basePath=/mnt/qask/file/
#Mq\u914D\u7F6E #Mq\u914D\u7F6E
rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group2=edu-admin-edit

3
src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
View File

@ -226,6 +226,9 @@
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"> <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
and (a.USERNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')) and (a.USERNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%'))
</if> </if>
<if test="pd.VALID_FLAG != null and pd.VALID_FLAG != ''">
and a.VALID_FLAG = #{pd.VALID_FLAG}
</if>
</select> </select>
<select id="getInfoById" resultType="com.zcloud.entity.PageData"> <select id="getInfoById" resultType="com.zcloud.entity.PageData">
select a.XGF_USER_ID, select a.XGF_USER_ID,