admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
pengjie 2023-07-28 09:40:26 +08:00
parent b9b9c6a2a4
commit 91593fcfb7
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
View File

@ -265,4 +265,10 @@ public class SystemUserAuthController {
return result; return result;
} }
} }
public static void main(String[] args) {
String ssoToken = "rlyWNnjYs1_wezKRvyKvJtjb4CnWHuSY9J8nE92iGvYP5bTkK_k4meZJ0c6wqDVu";
ssoToken = ssoToken.replace("-", "+").replace("_", "/");
System.out.println(Aes.decrypt(ssoToken, "ssologin66!@#$%^"));
}
} }

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -75,7 +75,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
QueryWrapper<SystemUser> wrapper = Wrappers.<SystemUser>query(); QueryWrapper<SystemUser> wrapper = Wrappers.<SystemUser>query();
SecurityUser user = SecurityUtil.getUser(); SecurityUser user = SecurityUtil.getUser();
wrapper.eq("u.account_type", user.getAccountType()); wrapper.eq("u.account_type", user.getAccountType());
wrapper.eq("u.sn", systemUser.getSn()); wrapper.eq("u.sn", systemUser.getSn() == null ? user.getSn() : systemUser.getSn());
wrapper.ne("u.user_id", user.getUserId()); wrapper.ne("u.user_id", user.getUserId());
return baseMapper.getPageList(wrapper); return baseMapper.getPageList(wrapper);
} }

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
View File

@ -232,10 +232,10 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
@Override @Override
public boolean saveInfo(InspectRecordVo inspectRecordVo) { public boolean saveInfo(InspectRecordVo inspectRecordVo) {
SecurityUser user = SecurityUtil.getUser(); SecurityUser user = SecurityUtil.getUser();
inspectRecordVo.setState(inspectRecordVo.getQuestionNum() == 0 ? 4 : 2);
inspectRecordVo.setCreateTime(new Date()); inspectRecordVo.setCreateTime(new Date());
inspectRecordVo.setCreateBy(user.getUserId()); inspectRecordVo.setCreateBy(user.getUserId());
inspectRecordVo.setQuestionNum(inspectRecordVo.getInspectQuestionList().size()); inspectRecordVo.setQuestionNum(inspectRecordVo.getInspectQuestionList().size());
inspectRecordVo.setState(inspectRecordVo.getQuestionNum() == 0 ? 4 : 2);
String inspectUser = inspectRecordVo.getInspectUser(); String inspectUser = inspectRecordVo.getInspectUser();
inspectRecordVo.setInspectUser(StringUtils.isNotBlank(inspectUser) ? inspectUser + "," + user.getUserId() : user.getUserId()); inspectRecordVo.setInspectUser(StringUtils.isNotBlank(inspectUser) ? inspectUser + "," + user.getUserId() : user.getUserId());
if (StringUtils.isNotBlank(inspectRecordVo.getEngineeringSn())) { if (StringUtils.isNotBlank(inspectRecordVo.getEngineeringSn())) {

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java
View File

@ -289,8 +289,6 @@ public class ProjectSubItemServiceImpl extends ServiceImpl<ProjectSubItemMapper,
if (DateUtil.between(projectSubItem.getPlanEndTime(), endTime, DateUnit.DAY, false) > 0){ if (DateUtil.between(projectSubItem.getPlanEndTime(), endTime, DateUnit.DAY, false) > 0){
if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) { if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) {
projectSubItem.setState(6); projectSubItem.setState(6);
} else if (task.getPercentageComplete().intValue() == 0 || actualStartDate == null || actualStartDate.getTime() > System.currentTimeMillis()) {
projectSubItem.setState(4);
} else { } else {
projectSubItem.setState(5); projectSubItem.setState(5);
} }