purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化功能权限接口

Browse Source
This commit is contained in:
季圣华
2021-09-03 23:05:36 +08:00
parent 4b9065b8ad
commit fe3436665e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
View File

@@ -161,16 +161,14 @@ public class FunctionController {
item.put("value", function.getId()); item.put("value", function.getId());
item.put("title", function.getName()); item.put("title", function.getName());
item.put("attributes", function.getName()); item.put("attributes", function.getName());
Boolean flag = ubValue.contains("[" + function.getId().toString() + "]");
if (flag) {
item.put("checked", true);
}
List<Function> funList = functionService.findRoleFunction(function.getNumber()); List<Function> funList = functionService.findRoleFunction(function.getNumber());
if(funList.size()>0) { if(funList.size()>0) {
JSONArray funArr = getFunctionList(funList, type, keyId); JSONArray funArr = getFunctionList(funList, type, keyId);
item.put("children", funArr); item.put("children", funArr);
dataArray.add(item); dataArray.add(item);
} else { } else {
Boolean flag = ubValue.contains("[" + function.getId().toString() + "]");
item.put("checked", flag);
dataArray.add(item); dataArray.add(item);
} }
} }

4
jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java
View File

@@ -13,6 +13,7 @@ import com.jsh.erp.service.userBusiness.UserBusinessService;
import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.FileUtils; import com.jsh.erp.utils.FileUtils;
import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.StringUtil;
import com.jsh.erp.utils.Tools;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -126,6 +127,9 @@ public class SystemConfigController {
if(StringUtil.isEmpty(bizPath)){ if(StringUtil.isEmpty(bizPath)){
bizPath = ""; bizPath = "";
} }
String token = request.getHeader("X-Access-Token");
Long tenantId = Tools.getTenantIdByToken(token);
bizPath = bizPath + File.separator + tenantId;
savePath = this.uploadLocal(file,bizPath); savePath = this.uploadLocal(file,bizPath);
if(StringUtil.isNotEmpty(savePath)){ if(StringUtil.isNotEmpty(savePath)){
res.code = 200; res.code = 200;