Merge remote-tracking branch 'origin/master'

dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java

@@ -3,7 +3,6 @@ package com.da.dangan.controller;
 import com.da.common.annotation.Log;
 import com.da.common.core.controller.BaseController;
 import com.da.common.core.domain.AjaxResult;
-import com.da.common.core.page.TableDataInfo;
 import com.da.common.enums.BusinessType;
 import com.da.common.utils.poi.ExcelUtil;
 import com.da.dangan.domain.DaCatalog;
@@ -33,11 +32,10 @@ public class DaCatalogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('dangan:catalog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DaCatalog daCatalog)
+    public AjaxResult list(DaCatalog daCatalog)
     {
-        startPage();
+        List<DaCatalog> catalogs = daCatalogService.selectAllDaCatalogList(daCatalog, getUserId());
-        List<DaCatalog> list = daCatalogService.selectDaCatalogList(daCatalog);
+        return success(catalogs);
-        return getDataTable(list);
     }
 
     /**
@@ -71,6 +69,11 @@ public class DaCatalogController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody DaCatalog daCatalog)
     {
+        if (!daCatalogService.checkDaCatalogNameUnique(daCatalog))
+        {
+            return error("新增部门'" + daCatalog.getMuName() + "'失败，目录名称已存在");
+        }
+        daCatalog.setCreateBy(getUsername());
         return toAjax(daCatalogService.insertDaCatalog(daCatalog));
     }
 

dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java

@@ -1,8 +1,9 @@
 package com.da.dangan.mapper;
 
-import java.util.List;
 import com.da.dangan.domain.DaCatalog;
 
+import java.util.List;
+
 /**
  * 档案目录Mapper接口
  * 
@@ -58,4 +59,8 @@ public interface DaCatalogMapper
      * @return 结果
      */
     public int deleteDaCatalogByIds(Long[] ids);
+
+    DaCatalog checkDaCatalogNameUnique(String muName, Long pid);
+
+    List<DaCatalog> selectDaCatalogListByUserId(DaCatalog daCatalog);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java

@@ -1,8 +1,9 @@
 package com.da.dangan.service;
 
-import java.util.List;
 import com.da.dangan.domain.DaCatalog;
 
+import java.util.List;
+
 /**
  * 档案目录Service接口
  * 
@@ -20,13 +21,21 @@ public interface IDaCatalogService
     public DaCatalog selectDaCatalogById(Long id);
 
     /**
-     * 查询档案目录列表
+     * 查询所有档案目录列表
      * 
      * @param daCatalog 档案目录
      * @return 档案目录集合
      */
     public List<DaCatalog> selectDaCatalogList(DaCatalog daCatalog);
 
+    /**
+     * 查询档案目录列表
+     *
+     * @param daCatalog 档案目录
+     * @return 档案目录集合
+     */
+    public List<DaCatalog> selectAllDaCatalogList(DaCatalog daCatalog, Long userId);
+
     /**
      * 新增档案目录
      * 
@@ -58,4 +67,6 @@ public interface IDaCatalogService
      * @return 结果
      */
     public int deleteDaCatalogById(Long id);
+
+    boolean checkDaCatalogNameUnique(DaCatalog daCatalog);
 }

dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml

@@ -39,6 +39,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDaCatalogVo"/>
         where id = #{id}
     </select>
+
+    <select id="checkDaCatalogNameUnique" resultMap="DaCatalogResult">
+        <include refid="selectDaCatalogVo"/>
+        where mu_name=#{muName} and pid = #{pid} limit 1
+    </select>
+
+    <select id="selectDaCatalogListByUserId" parameterType="DaCatalog" resultMap="DaCatalogResult">
+        select distinct c.*
+        from da_catalog c
+        left join da_user_catalog uc on c.id = uc.mu_id
+        where ur.user_id = #{params.userId}
+        <if test="muName != null and muName != ''">
+            AND c.mu_name like concat('%', #{muName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND c.status = #{status}
+        </if>
+        order by c.pid, c.order_num
+    </select>
         
     <insert id="insertDaCatalog" parameterType="DaCatalog" useGeneratedKeys="true" keyProperty="id">
         insert into da_catalog