|
|
|
@ -8,7 +8,6 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.tool.EncryptTool;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.tool.StringTool;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
|
|
|
@ -31,7 +30,10 @@ import org.slf4j.LoggerFactory;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.HashMap;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @Description :
|
|
|
|
@ -129,6 +131,7 @@ public class PersonnelController extends CoreBaseController {
|
|
|
|
|
// 关系 刷新
|
|
|
|
|
refreshRef(user, info, model);
|
|
|
|
|
|
|
|
|
|
endMultiService();
|
|
|
|
|
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
|
|
|
|
} catch (ImppBusiException busExcep) {
|
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
@ -729,7 +732,6 @@ public class PersonnelController extends CoreBaseController {
|
|
|
|
|
public void refreshSysUserPassword(SysUser user) throws Exception {
|
|
|
|
|
if (user != null) {
|
|
|
|
|
if (user.getId() != null) { // 更新密码
|
|
|
|
|
System.out.println("----> ----> "+!StringUtils.isAnyBlank(user.getUserLoginPassword()));
|
|
|
|
|
if (!StringUtils.isAnyBlank(user.getUserLoginPassword())) { // 使用新密码
|
|
|
|
|
user.setUserLoginPassword(EncryptTool.hexMD5(user.getUserLoginPassword().trim()));
|
|
|
|
|
} else { //使用旧密码
|
|
|
|
|