Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-admin/src/main/resources/application-dev.yml

@@ -188,10 +188,10 @@ sms:
 
 dsk:
   open:
-    endPoint: 120.27.13.145:8865
+    endPoint: pre-openapi.jiansheku.com
     accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: http
+    protocol: https
 #    endPoint: openapi.jiansheku.com
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b

dsk-admin/src/main/resources/application-test.yml

@@ -188,14 +188,16 @@ sms:
 
 dsk:
   open:
-    endPoint: 120.27.13.145:8865
+    endPoint: pre-openapi.jiansheku.com
     accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: http
+    protocol: https
 #    endPoint: openapi.jiansheku.com
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
 #    protocol: https
+  exportBackUrl: http://47.104.91.229:9099/export/backUrl
+
 sa-token:
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
   is-concurrent: true

dsk-operate-ui/src/api/system/user.js

-import request from '@/utils/request'
+import request from '@/utils/request';
 import { parseStrEmpty } from "@/utils/ruoyi";
 
 // 查询用户列表
@@ -7,7 +7,7 @@ export function listUser(query) {
     url: '/system/user/list',
     method: 'get',
     params: query
-  })
+  });
 }
 
 // 查询用户详细
@@ -15,7 +15,7 @@ export function getUser(userId) {
   return request({
     url: '/system/user/' + parseStrEmpty(userId),
     method: 'get'
-  })
+  });
 }
 
 // 新增用户
@@ -24,7 +24,7 @@ export function addUser(data) {
     url: '/system/user',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 修改用户
@@ -33,7 +33,7 @@ export function updateUser(data) {
     url: '/system/user',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 删除用户
@@ -41,7 +41,7 @@ export function delUser(userId) {
   return request({
     url: '/system/user/' + userId,
     method: 'delete'
-  })
+  });
 }
 
 // 用户密码重置
@@ -49,12 +49,12 @@ export function resetUserPwd(userId, password) {
   const data = {
     userId,
     password
-  }
+  };
   return request({
     url: '/system/user/resetPwd',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 用户状态修改
@@ -62,12 +62,12 @@ export function changeUserStatus(userId, status) {
   const data = {
     userId,
     status
-  }
+  };
   return request({
     url: '/system/user/changeStatus',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 查询用户个人信息
@@ -75,7 +75,7 @@ export function getUserProfile() {
   return request({
     url: '/system/user/profile',
     method: 'get'
-  })
+  });
 }
 
 // 修改用户个人信息
@@ -84,7 +84,7 @@ export function updateUserProfile(data) {
     url: '/system/user/profile',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 用户密码重置
@@ -92,12 +92,12 @@ export function updateUserPwd(oldPassword, newPassword) {
   const data = {
     oldPassword,
     newPassword
-  }
+  };
   return request({
     url: '/system/user/profile/updatePwd',
     method: 'put',
     params: data
-  })
+  });
 }
 
 // 用户头像上传
@@ -106,7 +106,7 @@ export function uploadAvatar(data) {
     url: '/system/user/profile/avatar',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 查询授权角色
@@ -114,7 +114,7 @@ export function getAuthRole(userId) {
   return request({
     url: '/system/user/authRole/' + userId,
     method: 'get'
-  })
+  });
 }
 
 // 保存授权角色
@@ -123,15 +123,18 @@ export function updateAuthRole(data) {
     url: '/system/user/authRole',
     method: 'put',
     params: data
-  })
+  });
 }
 
 // 查询部门下拉树结构
 export function deptTreeSelect() {
   return request({
-    url: '/system/user/deptTree',
-    method: 'get'
-  })
+    url: `/system/user/deptTree`,
+    method: 'get',
+    params: {
+      status: 0
+    }
+  });
 }
 
 // 用户文件记录列表
@@ -139,6 +142,6 @@ export function fileList(data) {
   return request({
     url: '/user/file/record/list',
     method: 'get',
-    params:data
-  })
+    params: data
+  });
 }

dsk-operate-ui/src/views/index.vue

@@ -114,7 +114,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="type">
-                  <el-select v-model="queryParams1.type" multiple collapse-tags @change="iptAdaptive(inputID6,'','changeSelect2')" :class="[`select-adaptive-${inputID6}`,queryParams1.type.length > 1 ? 'selectTag' : '']" clearable placeholder="项目类型">
+                  <el-select v-model="queryParams1.type" multiple collapse-tags @change="iptAdaptive(inputID6,true,'changeSelect2')" :class="[`select-adaptive-${inputID6}`,queryParams1.type.length > 1 ? 'selectTag' : '']" clearable placeholder="项目类型">
                     <el-option v-for="(item,index) in projectType" :key="index" :label="item" :value="item"></el-option>
                   </el-select>
                 </el-form-item>
@@ -253,7 +253,7 @@
               </el-select>
             </el-form-item>
             <el-form-item prop="projects">
-              <el-select v-model="queryParams2.projects" @change="iptAdaptive(inputID10,'','changeSelect3')" multiple collapse-tags clearable placeholder="项目类型" :class="[`select-adaptive-${inputID10}`,queryParams2.projects.length > 1 ? 'selectTag' : '']">
+              <el-select v-model="queryParams2.projects" @change="iptAdaptive(inputID10,true,'changeSelect3')" multiple collapse-tags clearable placeholder="项目类型" :class="[`select-adaptive-${inputID10}`,queryParams2.projects.length > 1 ? 'selectTag' : '']">
                 <el-option v-for="(item,index) in projectType" :key="index" :label="item" :value="item"></el-option>
               </el-select>
             </el-form-item>

dsk-system/src/main/java/com/dsk/system/service/impl/SysDeptServiceImpl.java

@@ -59,7 +59,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
                 .eq(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId())
                 .eq(ObjectUtil.isNotNull(dept.getParentId()), SysDept::getParentId, dept.getParentId())
                 .like(StringUtils.isNotBlank(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName())
-                .eq(SysDept::getStatus, 0)
+                .eq(StringUtils.isNotBlank(dept.getStatus()), SysDept::getStatus, dept.getStatus())
                 .orderByAsc(SysDept::getParentId)
                 .orderByAsc(SysDept::getOrderNum);
         return baseMapper.selectDeptList(lqw);