bug修复

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java

@@ -64,6 +64,11 @@ public abstract class BaseDomain implements Serializable {
 
     private String keyword;
 
+    /**
+     * 权限ID
+     */
+    private String dataScopeId;
+
     public String getKeyword() {
         return keyword;
     }
@@ -172,4 +177,5 @@ public abstract class BaseDomain implements Serializable {
     public void setSassId(String sassId) {
         this.sassId = sassId;
     }
+
 }

lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java

@@ -195,6 +195,8 @@ public class User extends BaseDomain {
     private String isMappingPerson;
     /** 人员所在部门（包括主岗和兼岗部门） */
     private String units;
+    /**权限ID*/
+    private String dataScopeId;
 
     public String getStrUserId() {
         return strUserId;
@@ -614,6 +616,14 @@ public class User extends BaseDomain {
         this.units = units;
     }
 
+    public String getDataScopeId() {
+        return dataScopeId;
+    }
+
+    public void setDataScopeId(String dataScopeId) {
+        this.dataScopeId = dataScopeId;
+    }
+
     @Override
     public String toString() {
         return "User{" +

lib/EmergencyBaseLib/EmergencyCommonmDatascope/src/main/java/com/zdxt/common/datascope/aspect/DataScopeAspect.java

@@ -100,9 +100,13 @@ public class DataScopeAspect {
             String userId = ServletUtils.getRequest().getParameter("dataScopeId");//APP如果要走数据权限必须传入这个值
             System.out.println("APP权限userId------------：" +userId);
             Object redisKeys = redisCache.getCacheObject("shiro:app:"+userId);
+            System.out.println("111111111111111111111---------------------:" + redisKeys);
             if (null != redisKeys && redisKeys instanceof User){
                 User appUser = (User) redisKeys;
+                System.out.println("2222222222----------------------------------:" + redisKeys);
+                System.out.println("是否是管理员：" +appUser.isAdmin());
                 if (!appUser.isAdmin()){
+                    System.out.println("333333333333333----------------------------------:" + appUser);
                     dataScopeFilter(joinPoint, appUser, controllerDataScope.deptAlias(),
                             controllerDataScope.userAlias());
                 }
@@ -147,19 +151,19 @@ public class DataScopeAspect {
             } else if (DATA_SCOPE_DEPT.equals(dataScope)) {
                 //别名为空
                 if(StringUtils.isEmpty(deptAlias)) {
-                    sqlString.append(StringUtils.format(" OR {} dept_id = {} ", deptAlias, user.getDeptId()));
+                    sqlString.append(StringUtils.format(" OR {} dept_id = '{}' ", deptAlias, user.getDeptId()));
                 }else{
                     //别名不为空
-                    sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id = '{}' ", deptAlias, user.getDeptId()));
                 }
             } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
                 if(StringUtils.isEmpty(deptAlias)){
                     sqlString.append(StringUtils.format(
-                            " OR {} dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) <> 0 )",
+                            " OR {} dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = '{}' or find_in_set( '{}' , ancestors ) <> 0 )",
                             deptAlias, user.getDeptId(), user.getDeptId()));
                 }else{
                     sqlString.append(StringUtils.format(
-                            " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) <> 0 )",
+                            " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = '{}' or find_in_set( '{}' , ancestors ) <> 0 )",
                             deptAlias, user.getDeptId(), user.getDeptId()));
                 }
 

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java

@@ -65,9 +65,9 @@ public class AppSystemController extends BaseController {
     }
 
 //    @RequiresPermissions("system:user:list")
-    @PostMapping("/listApp")
+    @GetMapping("/listApp")
     @ResponseBody
-    public ZDResponse listApp(@RequestBody User user) {
+    public ZDResponse listApp(User user) {
         List<User> list = userService.selectUserList(user);
         // 查询出职务
         for (User userData : list) {

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@@ -93,10 +93,10 @@ public class AppThirdLoginController {
             String userId = userOjb.getString("UserId");
 
 //            UserBean userBean = userApi.getUserByUserStrId(userId);
-            UserBean userBean = userApi.getUserByUserLoginName(userId);
+            User user = iUserService.selectUserByLoginName(userId);
 
-            redisCache.setCacheObject("shiro:app:"+userBean.getUserId(), userBean); // todo:这里需要将转换出来的User存redis用于做权限
-            return thirdLoginService.szyLogin(userBean.getLoginName());
+            redisCache.setCacheObject("shiro:app:"+user.getUserId(), user); // todo:这里需要将转换出来的User存redis用于做权限
+            return thirdLoginService.szyLogin(user.getLoginName());
         } catch (Exception e) {
             e.printStackTrace();
         }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ServerConfig.java

@@ -1,6 +1,8 @@
 package com.zdxt.auth.framework.config;
 
 import javax.servlet.http.HttpServletRequest;
+
+import com.zdxt.common.util.StringUtils;
 import org.springframework.stereotype.Component;
 import com.zdxt.auth.common.utils.ServletUtils;
 
@@ -30,4 +32,9 @@ public class ServerConfig
         String contextPath = request.getServletContext().getContextPath();
         return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString();
     }
+
+    public static void main(String[] args) {
+        System.out.println(StringUtils.format(" OR {}.dept_id = %s ", "a", "李军"));
+
+    }
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/common/CommonController.java

@@ -85,7 +85,7 @@ public class CommonController
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+            String url = fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("fileName", fileName);
             ajax.put("url", url);