Commit 56f4240b authored by 胡文斌's avatar 胡文斌

使用公共包方法

parent 6944a59e
package com.archser.aserver.service; package com.archser.aserver.service;
import com.archser.aserver.model.Organ;
import com.archser.aserver.util.redis.InfoUser;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
...@@ -10,6 +9,10 @@ import com.archser.aserver.model.Fond; ...@@ -10,6 +9,10 @@ import com.archser.aserver.model.Fond;
import com.archser.aserver.model.Menu; import com.archser.aserver.model.Menu;
import com.archser.aserver.model.User; import com.archser.aserver.model.User;
import com.archser.commons.db.InfoUser;
import com.archser.commons.model.AsOrgan;
import com.archser.commons.model.AsSystem;
import com.archser.commons.model.AsUser;
import com.jfinal.aop.Before; import com.jfinal.aop.Before;
import com.jfinal.kit.Kv; import com.jfinal.kit.Kv;
import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Db;
...@@ -30,7 +33,7 @@ public class UserService { ...@@ -30,7 +33,7 @@ public class UserService {
int update = Db.update(Db.getSql("updatePassword"), password, username); int update = Db.update(Db.getSql("updatePassword"), password, username);
if(update>0) { if(update>0) {
//更新redis信息 //更新redis信息
User user = InfoUser.getUser(username); AsUser user = InfoUser.getUser(username);
user.setPassword(password); user.setPassword(password);
InfoUser.saveUser(user); InfoUser.saveUser(user);
} }
...@@ -160,12 +163,12 @@ public class UserService { ...@@ -160,12 +163,12 @@ public class UserService {
* @param userId * @param userId
* @return * @return
*/ */
public List<System> findSystemWithUserPermission(int userId) { public List<AsSystem> findSystemWithUserPermission(int userId) {
/** /**
* xiaoying 20200414 YZJ-2725 隐藏菜单无法登录问题 start * xiaoying 20200414 YZJ-2725 隐藏菜单无法登录问题 start
*/ */
List<System> sysList = List<AsSystem> sysList =
System.dao.find(Db.getSqlPara("findSystemWithUserPermission", Kv.by("userId", userId))); AsSystem.dao.find(Db.getSqlPara("findSystemWithUserPermission", Kv.by("userId", userId)));
// xiaoying 20200608 勾选为隐藏菜单时找下一个服务 // xiaoying 20200608 勾选为隐藏菜单时找下一个服务
for (int i = sysList.size() - 1; i >= 0; i--) { for (int i = sysList.size() - 1; i >= 0; i--) {
Integer count = 0; Integer count = 0;
...@@ -186,7 +189,7 @@ public class UserService { ...@@ -186,7 +189,7 @@ public class UserService {
*/ */
} }
public Optional<System> getSystemByName(String systemName, List<System> systemList) { public Optional<AsSystem> getSystemByName(String systemName, List<AsSystem> systemList) {
return systemList.stream().filter(sys -> systemName.equalsIgnoreCase(sys.get("name"))) return systemList.stream().filter(sys -> systemName.equalsIgnoreCase(sys.get("name")))
.findFirst(); .findFirst();
} }
...@@ -283,13 +286,13 @@ public class UserService { ...@@ -283,13 +286,13 @@ public class UserService {
* @date 2021/1/8 17:05 * @date 2021/1/8 17:05
* @return com.archser.aserver.model.Organ * @return com.archser.aserver.model.Organ
*/ */
public Organ getUserFondOrgan(User user) { public AsOrgan getUserFondOrgan(AsUser user) {
Integer organId = user.getOrganId(); Integer organId = user.getOrganId();
Organ organ = Organ.dao.findById(organId); AsOrgan organ = AsOrgan.dao.findById(organId);
if (!"Y".equalsIgnoreCase(organ.getIsunit())) { if (!"Y".equalsIgnoreCase(organ.getIsunit())) {
String[] split = organ.getIdseq().split("\\."); String[] split = organ.getIdseq().split("\\.");
String fondOrganId = split[split.length - 1]; String fondOrganId = split[split.length - 1];
organ = Organ.dao.findById(fondOrganId); organ = AsOrgan.dao.findById(fondOrganId);
} }
return organ; return organ;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment