Merge remote-tracking branch 'origin/master'

boman-modules/boman-file/src/main/java/com/boman/file/service/LocalSysFileServiceImpl.java

@@ -82,7 +82,7 @@ public class LocalSysFileServiceImpl implements ISysFileService
     @Override
     public List<String> uploadFile(MultipartFile file) throws Exception {
         String name = FileUploadUtils.upload(localFilePath, file, maxSize);
-        String absolutePath = localFilePath + "\\" + name;
+        String absolutePath = localFilePath + name;
         String staticUrl = domain + localFilePrefix + name;
         LOGGER.info("上传静态路径路径为: {}, 绝对路径为: {}, 原文件名称: {}", staticUrl, absolutePath, file.getOriginalFilename());
         return Lists.newArrayList(staticUrl, absolutePath, file.getOriginalFilename());

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDeptServiceImpl.java

@@ -198,13 +198,19 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public int insertDept(SysDept dept)
     {
-        SysDept info = deptMapper.selectDeptById(dept.getParentId());
-        // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
-        {
-            throw new CustomException("部门停用，不允许新增");
+        SysDept parent = deptMapper.selectDeptById(dept.getParentId());
+        String ancestors = "0";
+        // 新增部门时，未选择上级部门处理
+        if (parent != null) {
+            // 如果父节点不为正常状态,则不允许新增子节点
+            if (!UserConstants.DEPT_NORMAL.equals(parent.getStatus()))
+            {
+                throw new CustomException("部门停用，不允许新增");
+            }
+            ancestors = parent.getAncestors() + "," + dept.getParentId();
         }
-        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+
+        dept.setAncestors(ancestors);
         return deptMapper.insertDept(dept);
     }
 

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: 'OA管理系统',
-  // urls: `http://118.31.23.65:7090`,
-  urls: `http://192.168.101.11:8090`,
+  urls: `http://118.31.23.65:7090`,
+  // urls: `http://192.168.101.11:8090`,
    // urls: `http://192.168.101.110:8090`,
 
   /**

ruoyi-ui/src/views/system/collection/index.vue

@@ -31,8 +31,8 @@
         </el-form-item>
         </el-col>
         <el-col :span="6" class="eigj" style="border: 1px solid red; border-bottom: 0; border-left: 0; ">
-        <el-form-item label="收到日期" prop="roleName">
-          <el-date-picker :disabled="false" @change="iChange" v-model="queryParams.roleName"   style="width: 100%"        type="date" :placeholder="'请输入'">
+        <el-form-item label="收到日期" prop="recieve_time">
+          <el-date-picker :disabled="false" @change="iChange" v-model="colleobje.recieve_time"   style="width: 100%"        type="date" :placeholder="'请输入'">
           </el-date-picker>
         </el-form-item>
         </el-col>
@@ -407,9 +407,9 @@ export default {
   },
   watch: {
     // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    }
+    // deptName(val) {
+    //   this.$refs.tree.filter(val);
+    // }
   },
   methods: {
     /** 查询角色列表 */
@@ -421,6 +421,20 @@ export default {
           console.log(res)
           if(res.data !== undefined){
             this.querjtgoe = res.data
+            this.colleobje.recieve_message_code = res.data.recieve_message_code
+            this.colleobje.message_from = res.data.message_from
+            this.colleobje.message_code = res.data.message_code
+            this.colleobje.roleName = res.data.roleName
+            this.colleobje.message_title = res.data.message_title
+            this.colleobje.dept_suggest = res.data.dept_suggest
+            this.colleobje.office_suggest = res.data.office_suggest
+            this.colleobje.leader_suggest = res.data.leader_suggest
+            this.colleobje.office_suggest = res.data.office_suggest
+            this.colleobje.leader_suggest = res.data.leader_suggest
+            this.colleobje.result = res.data.result
+            this.colleobje.check_user_name = res.data.check_user_name
+            this.colleobje.recieve_time = res.data.recieve_time
+
             if(res.data.message_body !== undefined){
               this.config = res.data.message_body
             }