clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

注册默认为101工圈子

This commit is contained in:
kuang.yife 2023-09-30 23:54:42 +08:00
parent bc8a43ce2f
commit 1df8410b99
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java
View File

@ -47,6 +47,7 @@ public class SysRegisterService
} else if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkPhoneUnique(sysUser))) {
msg = "保存手机号码'" + userAddDTO.getPhonenumber() + "'失败，该手机号码已被注册";
} else {
sysUser.setDeptId(101L);
sysUser.setPwdUpdateDate(DateUtils.getNowDate());
sysUser.setUserName(userAddDTO.getLoginName());
sysUser.setSalt(ShiroUtils.randomSalt());

3
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -138,8 +138,7 @@
</if>
<if test="workerId == -1">
AND om.worker_id IS NULL
AND ( (om.order_mode in ('01','03','04'))
OR (om.order_mode = '02' and fm.pay_status = 1) OR (om.order_mode is null))
AND ( (om.order_mode in ('01','03','04','02')) OR (om.order_mode is null))
</if>
<if test="sysPayStatus != null">
AND fm.pay_status = #{sysPayStatus}