Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/SysConfigController.java

@@ -1,13 +1,11 @@
 package com.keao.edu.user.controller;
 
 
+import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.common.entity.SysConfig;
+import com.keao.edu.user.service.SysConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -16,10 +14,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.SysConfig;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.service.SysConfigService;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 系统配置控制层
@@ -36,10 +33,10 @@ public class SysConfigController extends BaseController {
 	@GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('sysConfig/list')")
 	public Object configList(String group) {
-		String tenantId = TenantContextHolder.getTenantId();
+//		String tenantId = TenantContextHolder.getTenantId();
 		Map<String,Object> params = new HashMap<String, Object>();
 		params.put("group", group);
-		params.put("tenantId", tenantId);
+//		params.put("tenantId", tenantId);
 		return succeed(sysConfigService.findAll(params));
 	}