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

暂时回滚人员中台相关代码

dev-9.10-修复中台bug-xuyifeng
water_xu 2024-09-10 16:51:54 +08:00
parent 1cb6ce1c95
commit 2e517e44a3
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -778,7 +778,7 @@ public class UsersController extends BaseController {
}
map.put("result", errInfo);
map.put("code","0");
map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd)));
// map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd)));
return map;
}
@ -798,7 +798,7 @@ public class UsersController extends BaseController {
usersService.editUserFuns(pd); //执行修改
map.put("result", errInfo);
map.put("code", "0");
map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd)));
// map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd)));
return map;
}
@ -830,7 +830,7 @@ public class UsersController extends BaseController {
FHLOG.save(Jurisdiction.getUsername(), "从个人资料中修改" + pd.getString("USERNAME") + "的资料"); //记录日志
map.put("result", errInfo);
map.put("code", "0");
map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd)));
// map.put("syncInfo", JSONUtil.toJsonStr(usersService.findById(pd)));
return map;
}
@ -915,11 +915,14 @@ public class UsersController extends BaseController {
pd.put("IP", ""); //IP
pd.put("STATUS", "0"); //状态
pd.put("ISMAIN", "0"); //状态
pd.put("ISDELETE", "1"); //是否删除，0表示不删除
// pd.put("ISDELETE", "1"); //是否删除，0表示不删除
// 人员中台暂时不用
pd.put("ISDELETE", "0"); //是否删除，0表示不删除
pd.put("SKIN", "pcoded-navbar navbar-image-3,navbar pcoded-header navbar-expand-lg navbar-light header-dark,"); //用户默认皮肤
pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString()); //密码加密
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISPUSH", "0");
// pd.put("ISPUSH", "0");
// 人员中台暂时不用
Map<String, String> resultMap = doCheck(pd.getString("USERNAME"), pd.getString("USER_ID_CARD"), "");
if (resultMap.get("result").equals("success")) {
if (null == usersService.findByUsername(pd)) { //判断用户名是否存在
@ -1029,7 +1032,7 @@ public class UsersController extends BaseController {
map.put("USER_ID",ID);
map.put("result", errInfo); //返回结果
map.put("code", "0");
map.put("syncInfo", JSONUtil.toJsonStr(userinfo));
// map.put("syncInfo", JSONUtil.toJsonStr(userinfo));
} else {
map.put("result", "您输入的身份证号和用户名二次校验失败，请确认后重新申请"); //返回结果
}

4
src/main/java/com/zcloud/syncData/SyncDataAdviceAspect.java
View File

@ -25,8 +25,8 @@ import java.util.Map;
* 作者：water_xu
* 官网：www.zcloudchina.com
*/
@Aspect
@Component
//@Aspect
//@Component
@SuppressWarnings("all")
public class SyncDataAdviceAspect {

5
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -634,10 +634,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (u.ISPUSH = "1" or u.ISMAIN = "1")
and u.ISDELETE = '0'
</if>
<if test='pd.ISPUSH == "2"'>
AND u.ISDELETE = '0'
</if>
<!--
<if test='pd.ISPUSH != "1"'>
AND (u.ISPUSH != "1" or u.ISPUSH is null)
AND (u.ISDELETE != "1" or u.ISPUSH = "0" )
</if>
-->
</if>
<if test="pd.IS_HAZARDCONFIRMER != null and pd.IS_HAZARDCONFIRMER != ''"><!-- 关键词检索 -->
AND