bonus
/
gzdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:ee0107384e7790becf7cb72b985124480b85204e
Branches Tags
bonus:master
bonus:test-0831-audit
bonus:f0822
..
compare: bonus:8f07301082f3779bc6542c2667cbea79d7892f57
Branches Tags
bonus:master
bonus:test-0831-audit
bonus:f0822

No commits in common. "ee0107384e7790becf7cb72b985124480b85204e" and "8f07301082f3779bc6542c2667cbea79d7892f57" have entirely different histories.
ee0107384e ... 8f07301082

5 changed files with 6 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
View File

@ -108,7 +108,7 @@ public class SysProfileController extends BaseController {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newDecrypt)); loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newDecrypt));
tokenService.setLoginUser(loginUser); tokenService.setLoginUser(loginUser);
userService.updatePwdState(loginUser); userService.updatePwdState();
return success(); return success();
} }
return error("修改密码异常，请联系管理员"); return error("修改密码异常，请联系管理员");

4
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java
View File

@ -1,8 +1,6 @@
package com.bonus.sgzb.system.mapper; package com.bonus.sgzb.system.mapper;
import java.util.List; import java.util.List;
import com.bonus.sgzb.system.api.model.LoginUser;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.domain.SysUser;
@ -139,5 +137,5 @@ public interface SysUserMapper
String selectforceChangePwd(String username); String selectforceChangePwd(String username);
void updatePwdState(LoginUser loginUser); void updatePwdState();
} }

3
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysUserService.java
View File

@ -4,7 +4,6 @@ import java.util.List;
import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.domain.SysUser;
import com.bonus.sgzb.system.api.model.LoginUser;
import com.bonus.sgzb.system.domain.po.UrgentProcessingUser; import com.bonus.sgzb.system.domain.po.UrgentProcessingUser;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -228,5 +227,5 @@ public interface ISysUserService
String selectforceChangePwd(String username); String selectforceChangePwd(String username);
void updatePwdState(LoginUser loginUser); void updatePwdState();
} }

4
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
View File

@ -582,8 +582,8 @@ public class SysUserServiceImpl implements ISysUserService {
} }
@Override @Override
public void updatePwdState(LoginUser loginUser) { public void updatePwdState() {
userMapper.updatePwdState(loginUser); userMapper.updatePwdState();
} }

3
sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -257,10 +257,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update purchase_notice_person set telphone = #{phonenumber} where user_id = #{userId} update purchase_notice_person set telphone = #{phonenumber} where user_id = #{userId}
</update> </update>
<update id="updatePwdState"> <update id="updatePwdState">
update sys_user set force_change_pwd = '0' where user_id = #{userid} update sys_user set force_change_pwd = '0'
</update> </update>
<delete id="deleteUserById" parameterType="Long"> <delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId} update sys_user set del_flag = '2' where user_id = #{userId}
</delete> </delete>