zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
zhaodui 2022-05-27 11:26:15 +08:00
parent 728a0b0b1e 1280808c49
commit 6dd381a72d
2 changed files with 23 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/jeecgframework/web/system/controller/core/LoginController.java
View File

@ -349,24 +349,7 @@ public class LoginController extends BaseController{
if (client.getFunctions() == null || client.getFunctions().size() == 0) {
Map<String, TSFunction> loginActionlist = new HashMap<String, TSFunction>();
/*String hql="from TSFunction t where t.id in (select d.TSFunction.id from TSRoleFunction d where d.TSRole.id in(select t.TSRole.id from TSRoleUser t where t.TSUser.id ='"+
user.getId()+"' ))";
String hql2="from TSFunction t where t.id in ( select b.tsRole.id from TSRoleOrg b where b.tsDepart.id in(select a.tsDepart.id from TSUserOrg a where a.tsUser.id='"+
user.getId()+"'))";
List<TSFunction> list = systemService.findHql(hql);
log.info("role functions: "+list.size());
for(TSFunction function:list){
loginActionlist.put(function.getId(),function);
}
List<TSFunction> list2 = systemService.findHql(hql2);
log.info("org functions: "+list2.size());
for(TSFunction function:list2){
loginActionlist.put(function.getId(),function);
}*/
StringBuilder hqlsb1=new StringBuilder("select distinct f from TSFunction f,TSRoleFunction rf,TSRoleUser ru ").append("where ru.TSRole.id=rf.TSRole.id and rf.TSFunction.id=f.id and ru.TSUser.id=? ");
StringBuilder hqlsb2=new StringBuilder("select distinct c from TSFunction c,TSRoleFunction rf,TSRoleOrg b,TSUserOrg a ")
.append("where a.tsDepart.id=b.tsDepart.id and b.tsRole.id=rf.TSRole.id and rf.TSFunction.id=c.id and a.tsUser.id=?");
List<TSFunction> list1 = systemService.findHql(hqlsb1.toString(),user.getId());
@ -378,8 +361,6 @@ public class LoginController extends BaseController{
loginActionlist.put(function.getId(),function);
}
client.setFunctions(loginActionlist);
//清空变量，降低内存使用
list2.clear();
list1.clear();
@ -450,15 +431,7 @@ public class LoginController extends BaseController{
*/
@RequestMapping(params = "hplushome")
public ModelAndView hplushome(HttpServletRequest request) {
SysThemesEnum sysTheme = SysThemesUtil.getSysTheme(request);
//ACE ACE2 DIY时需要在home.jsp头部引入依赖的js及css文件
/*if("ace".equals(sysTheme.getStyle())||"diy".equals(sysTheme.getStyle())||"acele".equals(sysTheme.getStyle())){
request.setAttribute("show", "1");
} else {//default及shortcut不需要引入依赖文件，所有需要屏蔽
request.setAttribute("show", "0");
}*/
return new ModelAndView("main/hplushome");
}
/**

2
src/main/resources/dbconfig.properties
View File

@ -17,7 +17,7 @@
#MySQL
hibernate.dialect=org.hibernate.dialect.MySQLDialect
validationQuery.sqlserver=SELECT 1
jdbc.url.jeecg=jdbc:mysql://127.0.0.1:3306/jee-wms?useUnicode=true&characterEncoding=UTF-8
jdbc.url.jeecg=jdbc:mysql://127.0.0.1:3306/wms?useUnicode=true&characterEncoding=UTF-8
jdbc.username.jeecg=root
jdbc.password.jeecg=Zzerp123