From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java
index 883b780..538a8ca 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java
@@ -116,7 +116,11 @@
if(Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
pageWrap.getModel().setType(Constants.USERTYPE.COM);
}else{
- pageWrap.getModel().setType(Constants.USERTYPE.PLAT);
+ if(pageWrap.getModel().getType()!=null){
+ //璧版煡璇�
+ }else{
+ pageWrap.getModel().setType(Constants.USERTYPE.PLAT);
+ }
}
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
return PageData.from(new PageInfo<>(systemPermissionMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause())));
--
Gitblit v1.9.3