完成部门管理和栏目管理所有后端接口,并调试

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/TjController.java

@@ -187,8 +187,14 @@ public class TjController {
         return SendUtil.send(false, ConstStr.RESULT_FAILED);
     }
 
+    /**
+     * 保存部门信息
+     *
+     * @param department
+     * @return
+     */
     @PostMapping("/saveDept")
-    public Map<String,Object> saveDept(Department department){
+    public Map<String, Object> saveDept(Department department) {
         try {
             return tjService.saveDept(department);
         } catch (Exception e) {
@@ -197,6 +203,12 @@ public class TjController {
         return SendUtil.send(false, ConstStr.RESULT_FAILED);
     }
 
+    /**
+     * 通过部门id查询部门信息
+     *
+     * @param deptid
+     * @return
+     */
     @GetMapping("/getDeptById")
     public Map<String, Object> getDeptById(Integer deptid) {
         try {
@@ -210,13 +222,159 @@ public class TjController {
         return SendUtil.send(false, ConstStr.DATA_NOT_FOUND);
     }
 
+    /**
+     * 修改部门信息
+     *
+     * @param department
+     * @return
+     */
+    @PostMapping("/updateDeptById")
+    public Map<String, Object> updateDeptById(Department department) {
+        try {
+            if (Blank.isEmpty(department.getDeptid())) {
+                return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS, "部门id不能为空");
+            }
+            return tjService.updateDeptById(department);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SendUtil.send(false, ConstStr.RESULT_FAILED);
+    }
+
+    /**
+     * 通过部门id,逻辑删除部门信息
+     *
+     * @param deptid
+     * @return
+     */
+    @PostMapping("/deleteDeptById")
+    public Map<String, Object> deleteDeptById(Integer deptid) {
+        try {
+            if (Blank.isEmpty(deptid)) {
+                return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS, "部门id不能为空");
+            }
+            return tjService.deleteDeptById(deptid);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SendUtil.send(false, ConstStr.RESULT_FAILED);
+    }
+
+    /**
+     * 通过部门id,分页查询对应的栏目信息
+     *
+     * @param page
+     * @param limit
+     * @param deptid
+     * @return
+     */
     @GetMapping("/getChnlidListByDeptid")
     public Map<String, Object> getChnlidListByDeptid(Integer page, Integer limit, Integer deptid) {
         try {
-            if (Blank.isNotEmpty(deptid)) {
+            if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit) && page > 0 && limit > 0 && Blank.isNotEmpty(deptid)) {
                 return SendUtil.send(true, null, tjService.getChnlidListByDeptid(page, limit, deptid));
             }
-            return SendUtil.send(true, ConstStr.REQUEST_WRONGPARAMS, "deptid不能为空");
+            return SendUtil.send(true, ConstStr.REQUEST_WRONGPARAMS, "page和limit不能为空,且要大于0,deptid不能为空");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SendUtil.send(false, ConstStr.RESULT_FAILED);
+    }
+
+    /**
+     * 分页查询所有的栏目信息
+     *
+     * @param page
+     * @param limit
+     * @param deptName
+     * @param chnlid
+     * @param chnlidName
+     * @return
+     */
+    @GetMapping("/getChnlidListPage")
+    public Map<String, Object> getChnlidListPage(Integer page, Integer limit, String deptName, Integer chnlid, String chnlidName) {
+        try {
+            if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit) && page > 0 && limit > 0) {
+                return SendUtil.send(true, null, tjService.getChnlidListPage(page, limit, deptName, chnlid, chnlidName));
+            }
+            return SendUtil.send(true, ConstStr.REQUEST_WRONGPARAMS, "page和limit不能为空,且要大于0,deptid不能为空");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SendUtil.send(false, ConstStr.RESULT_FAILED);
+    }
+
+    /**
+     * 查询未分配归属的栏目
+     *
+     * @param chnlid
+     * @param chnlidName
+     * @return
+     */
+    @GetMapping("/getNotVestedChnlid")
+    public Map<String, Object> getNotVestedChnlid(Integer page, Integer limit, Integer chnlid, String chnlidName) {
+        try {
+            if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit) && page > 0 && limit > 0) {
+                return tjService.getNotVestedChnlid(page, limit, chnlid, chnlidName);
+            }
+            return SendUtil.send(true, ConstStr.REQUEST_WRONGPARAMS, "page和limit不能为空,且要大于0");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SendUtil.send(false, ConstStr.RESULT_FAILED);
+    }
+
+    /**
+     * 这里作的保存,一个栏目只能存在与一个部门下
+     *
+     * @param chnlid
+     * @param deptid
+     * @return
+     */
+    @PostMapping("/saveChnlid")
+    public Map<String, Object> saveChnlid(Integer chnlid, Integer deptid) {
+        try {
+            if (Blank.isEmpty(chnlid) || Blank.isEmpty(deptid)) {
+                return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS, "部门不能为空.栏目也不能为空");
+            }
+            return tjService.saveChnlid(chnlid, deptid);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SendUtil.send(false, ConstStr.RESULT_FAILED);
+    }
+
+    /**
+     *
+     * @param id
+     * @param deptid
+     * @return
+     */
+    @PostMapping("/updateChnlidBelong")
+    public Map<String, Object> updateChnlidBelong(Integer id, Integer deptid) {
+        try {
+            if (Blank.isEmpty(id) || Blank.isEmpty(deptid)) {
+                return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS, "部门不能为空.id也不能为空");
+            }
+            return tjService.updateChnlidBelong(id, deptid);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SendUtil.send(false, ConstStr.RESULT_FAILED);
+    }
+
+    /**
+     * 通过id逻辑删除栏目
+     * @param id
+     * @return
+     */
+    @PostMapping("/deleteChnlidById")
+    public Map<String, Object> deleteChnlidById(Integer id) {
+        try {
+            if (Blank.isEmpty(id)) {
+                return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS, "id不能为空");
+            }
+            return tjService.deleteChnlidById(id);
         } catch (Exception e) {
             e.printStackTrace();
         }

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/TjDao.java

@@ -284,4 +284,28 @@ public interface TjDao {
     Department getDepartmentByName(@Param("deptname") String deptname);
 
     Integer saveDept(Department department);
+
+    Department getDeptById(@Param("deptid") Integer deptid, Integer is_deleted);
+
+    Department getDepartmentByNameId(@Param("deptid") Integer deptid, @Param("deptname") String deptname);
+
+    Integer updateDeptById(Department department);
+
+    Integer deleteDeptById(@Param("deptid") Integer deptid, Integer deleted);
+
+    Map<String, Object> getChnlidByChnlid(@Param("chnlid") Integer chnlid);
+
+    Integer saveChnlid(@Param("chnlid") Integer chnlid, @Param("deptid") Integer deptid, @Param("is_deleted") Integer is_deleted);
+
+    List<Map<String, Object>> getNotVestedChnlid(@Param("startRows") Integer startRows, @Param("limit") Integer limit, @Param("chnlid") Integer chnlid, @Param("chnlidName") String chnlidName);
+
+    long getNotVestedChnlidCount(@Param("chnlid") Integer chnlid, @Param("chnlidName") String chnlidName);
+
+    long getChnlidAllCount(@Param("deptName") String deptName, @Param("chnlid") Integer chnlid, @Param("chnlidName") String chnlidName);
+
+    List<Map<String, Object>> getChnlidListPage(@Param("startRows") Integer startRows, @Param("limit") Integer limit, @Param("deptName") String deptName, @Param("chnlid") Integer chnlid, @Param("chnlidName") String chnlidName);
+
+    Integer deleteChnlidById(@Param("id") Integer id, @Param("deleted") Integer deleted);
+
+    Integer updateChnlidBelong(@Param("id") Integer id, @Param("deptid") Integer deptid);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/UserDao.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 
 import com.example.nngkxxdp.entity.User;
+import org.springframework.stereotype.Repository;
 
 /**
  * @ClassName UserDao
@@ -14,100 +15,102 @@ import com.example.nngkxxdp.entity.User;
  * @Date 2021/10/21
  * @Version 1.0
  **/
-
+@Repository
 public interface UserDao {
-	User checkUserNameAndPassWord(@Param("username") String username, @Param("password") String password);
-
-	Integer selectUser(String username);
-
-	Map<String, String> selectSalt(String username);
-
-	/**
-	 * 分页查询用户列表
-	 *
-	 * @param param
-	 * @return
-	 */
-	List<Map<String, Object>> getUserListByPage(Map<String, Object> param);
-
-	Integer countByPage(Map<String, Object> param);
-
-	/**
-	 * 新增用户
-	 *
-	 * @param user
-	 * @return
-	 */
-	int addUser(User user);
-
-	/**
-	 * 判断用户名是否重复
-	 *
-	 * @param userName
-	 * @return
-	 */
-	int checkUsername(String userName);
-
-	/**
-	 * 根据id删除用户
-	 *
-	 * @param id
-	 * @return
-	 */
-	int removeUserById(Integer id);
-
-	/**
-	 * 根据id查询用户
-	 *
-	 * @param id
-	 * @return
-	 */
-	Map<String, Object> selectOne(Integer id);
-
-	/**
-	 * 修改用户
-	 *
-	 * @param user
-	 * @return
-	 */
-	int updateUser(@Param("user") User user, @Param("pd") String pd);
-
-	/**
-	 * 修改部门信息
-	 * @return
-	 */
-	int updatePersoninfo(@Param("deptid") Integer deptid,@Param("mainLeader") String mainLeader, @Param("mainLeaderPhone") String mainLeaderPhone,@Param("leaderperson") String leaderperson,@Param("leaderphone") String leaderphone,@Param("workperson") String workperson,@Param("workphone") String workphone);
-
-	/**
-	 * 查询部门
-	 *
-	 * @return
-	 */
-	List<Map<String, Object>> selectDept();
-
-	/**
-	 * 查询用户标识
-	 *
-	 * @param username
-	 * @return
-	 */
-	Map<String, Object> selectUserRole(String username);
-
-	/**
-	 * 判断原密码是否输入正确
-	 * 
-	 * @param username
-	 * @param pd
-	 * @return
-	 */
-	int checkPassword(@Param("username") String username, @Param("pd") String pd);
-	
-	List<Map<String, Object>> getAllPhoneByUser();
-
-	/**
-	 * 根据用户ID查询盐
-	 * @param userId
-	 * @return
-	 */
-	String selectSaltByUserId(@Param("userId") Integer userId);
+    User checkUserNameAndPassWord(@Param("username") String username, @Param("password") String password);
+
+    Integer selectUser(String username);
+
+    Map<String, String> selectSalt(String username);
+
+    /**
+     * 分页查询用户列表
+     *
+     * @param param
+     * @return
+     */
+    List<Map<String, Object>> getUserListByPage(Map<String, Object> param);
+
+    Integer countByPage(Map<String, Object> param);
+
+    /**
+     * 新增用户
+     *
+     * @param user
+     * @return
+     */
+    int addUser(User user);
+
+    /**
+     * 判断用户名是否重复
+     *
+     * @param userName
+     * @return
+     */
+    int checkUsername(String userName);
+
+    /**
+     * 根据id删除用户
+     *
+     * @param id
+     * @return
+     */
+    int removeUserById(Integer id);
+
+    /**
+     * 根据id查询用户
+     *
+     * @param id
+     * @return
+     */
+    Map<String, Object> selectOne(Integer id);
+
+    /**
+     * 修改用户
+     *
+     * @param user
+     * @return
+     */
+    int updateUser(@Param("user") User user, @Param("pd") String pd);
+
+    /**
+     * 修改部门信息
+     *
+     * @return
+     */
+    int updatePersoninfo(@Param("deptid") Integer deptid, @Param("mainLeader") String mainLeader, @Param("mainLeaderPhone") String mainLeaderPhone, @Param("leaderperson") String leaderperson, @Param("leaderphone") String leaderphone, @Param("workperson") String workperson, @Param("workphone") String workphone);
+
+    /**
+     * 查询部门
+     *
+     * @return
+     */
+    List<Map<String, Object>> selectDept();
+
+    /**
+     * 查询用户标识
+     *
+     * @param username
+     * @return
+     */
+    Map<String, Object> selectUserRole(String username);
+
+    /**
+     * 判断原密码是否输入正确
+     *
+     * @param username
+     * @param pd
+     * @return
+     */
+    int checkPassword(@Param("username") String username, @Param("pd") String pd);
+
+    List<Map<String, Object>> getAllPhoneByUser();
+
+    /**
+     * 根据用户ID查询盐
+     *
+     * @param userId
+     * @return
+     */
+    String selectSaltByUserId(@Param("userId") Integer userId);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/TjService.java

@@ -66,5 +66,19 @@ public interface TjService {
 
     Map<String, Object> saveDept(Department department);
 
-    Map<String, Object> getDeptById(Integer deptid);
+    Department getDeptById(Integer deptid);
+
+    Map<String, Object> updateDeptById(Department department);
+
+    Map<String, Object> deleteDeptById(Integer deptid);
+
+    Map<String, Object> saveChnlid(Integer chnlid, Integer deptid);
+
+    Map<String, Object> getNotVestedChnlid(Integer page, Integer limit, Integer chnlid, String chnlidName);
+
+    Map<String, Object> getChnlidListPage(Integer page, Integer limit, String deptName, Integer chnlid, String chnlidName);
+
+    Map<String, Object> updateChnlidBelong(Integer id, Integer deptid);
+
+    Map<String, Object> deleteChnlidById(Integer id);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/TjServiceImpl.java

@@ -1436,11 +1436,11 @@ public class TjServiceImpl implements TjService {
     }
 
     @Override
-    public Map<String, Object> saveDept(Department department) {
-        if(Blank.isEmpty(department.getDeptname())){
+    public synchronized Map<String, Object> saveDept(Department department) {
+        if (Blank.isEmpty(department.getDeptname())) {
             return SendUtil.send(true, ConstStr.ADD_FAILED, "部门名称不能为空");
         }
-        if(Blank.isEmpty(department.getSortid())){
+        if (Blank.isEmpty(department.getSortid())) {
             return SendUtil.send(true, ConstStr.ADD_FAILED, "部门分类不能为空");
         }
         Department oldDepartment = tjDao.getDepartmentByName(department.getDeptname());
@@ -1454,8 +1454,82 @@ public class TjServiceImpl implements TjService {
     }
 
     @Override
-    public Map<String, Object> getDeptById(Integer deptid) {
-        return null;
+    public Department getDeptById(Integer deptid) {
+        return tjDao.getDeptById(deptid, ConstStr.NOT_DELETED);
+    }
+
+    @Override
+    public Map<String, Object> updateDeptById(Department department) {
+        if (Blank.isEmpty(department.getDeptname())) {
+            return SendUtil.send(true, ConstStr.UPDATEUSER_FAILED, "部门名称不能为空");
+        }
+        if (Blank.isEmpty(department.getSortid())) {
+            return SendUtil.send(true, ConstStr.UPDATEUSER_FAILED, "部门分类不能为空");
+        }
+        Department oldDepartment = tjDao.getDepartmentByNameId(department.getDeptid(), department.getDeptname());
+        if (Blank.isEmpty(oldDepartment)) {
+            if (tjDao.updateDeptById(department) <= 0) {
+                return SendUtil.send(true, ConstStr.UPDATEUSER_FAILED, "");
+            }
+            return SendUtil.send(true, ConstStr.UPDATEUSER_SUCCESS, "");
+        }
+        return SendUtil.send(true, ConstStr.UPDATEUSER_FAILED, "存在相同的部门名称");
+    }
+
+    @Override
+    public Map<String, Object> deleteDeptById(Integer deptid) {
+        if (tjDao.deleteDeptById(deptid, ConstStr.DELETED) <= 0) {
+            return SendUtil.send(false, ConstStr.DELETEUSER_FAILED, "");
+        }
+        return SendUtil.send(true, ConstStr.DELETEUSER_SUCCESS, "");
+    }
+
+    @Override
+    public synchronized Map<String, Object> saveChnlid(Integer chnlid, Integer deptid) {
+        Map<String, Object> oldMap = tjDao.getChnlidByChnlid(chnlid);
+        if (Blank.isEmpty(oldMap)) {
+            if (tjDao.saveChnlid(chnlid, deptid, ConstStr.NOT_DELETED) <= 0) {
+                return SendUtil.send(true, ConstStr.ADD_FAILED, "");
+            }
+            return SendUtil.send(true, ConstStr.ADD_SUCCESS, "");
+        }
+        return SendUtil.send(true, ConstStr.ADD_FAILED, "已经存在此栏目");
+    }
+
+    @Override
+    public Map<String, Object> getNotVestedChnlid(Integer page, Integer limit, Integer chnlid, String chnlidName) {
+        int startRows = (page - 1) * limit;
+        long count = tjDao.getNotVestedChnlidCount(chnlid, chnlidName);
+        if (count > 0) {
+            return SendUtil.layuiTable(count, tjDao.getNotVestedChnlid(startRows, limit, chnlid, chnlidName));
+        }
+        return SendUtil.layuiTable(0, null);
+    }
+
+    @Override
+    public Map<String, Object> getChnlidListPage(Integer page, Integer limit, String deptName, Integer chnlid, String chnlidName) {
+        int startRows = (page - 1) * limit;
+        long count = tjDao.getChnlidAllCount(deptName, chnlid, chnlidName);
+        if (count > 0) {
+            return SendUtil.layuiTable(count, tjDao.getChnlidListPage(startRows, limit, deptName, chnlid, chnlidName));
+        }
+        return SendUtil.layuiTable(0, null);
+    }
+
+    @Override
+    public synchronized Map<String, Object> updateChnlidBelong(Integer id, Integer deptid) {
+        if (tjDao.updateChnlidBelong(id, deptid) <= 0) {
+            return SendUtil.send(true, ConstStr.UPDATEUSER_FAILED, "");
+        }
+        return SendUtil.send(true, ConstStr.UPDATEUSER_SUCCESS, "");
+    }
+
+    @Override
+    public Map<String, Object> deleteChnlidById(Integer id) {
+        if (tjDao.deleteChnlidById(id, ConstStr.DELETED) <= 0) {
+            return SendUtil.send(false, ConstStr.DELETEUSER_FAILED, "");
+        }
+        return SendUtil.send(true, ConstStr.DELETEUSER_SUCCESS, "");
     }
 
     private int getArrayIndex(List<String> arr, String obj) {

nngkxxdp/src/main/resources/mapper/PostManagementDao.xml

@@ -125,6 +125,7 @@
     <insert id="updatePostById" parameterType="java.util.Map">
         UPDATE h_post_management
         SET post_title=#{postTitle},
+            type=#{type},
             draft_interpretation=#{draftInterpretation},
             draft_decision=#{draftDecision},
             make_policy=#{makePolicy},

nngkxxdp/src/main/resources/mapper/TjDao.xml

@@ -525,20 +525,23 @@
         SELECT
         a.id,
         a.deptid,
+        c.deptname,
         a.chnlid,
         b.CHNLIDNAME
         FROM
         (
-        SELECT id, deptid, chnlid FROM t_dept_chnlid WHERE 1 = 1
-        <if test="deptid != null">
-            AND deptid =#{deptid}
-        </if>
-        <if test="is_deleted != null">
-            AND is_deleted =#{is_deleted}
-        </if>
+        SELECT id, deptid, chnlid FROM t_dept_chnlid
+        <where>1 = 1
+            <if test="deptid != null">
+                AND deptid =#{deptid}
+            </if>
+            <if test="is_deleted != null">
+                AND is_deleted =#{is_deleted}
+            </if>
+        </where>
         limit #{startRows},#{limit} ) a
         LEFT JOIN ( SELECT chnlid, CHNLIDNAME FROM save_hlw_interface_data GROUP BY chnlid ) b ON a.chnlid =
-        b.chnlid
+        b.chnlid LEFT JOIN t_dept c ON a.deptid = c.deptid
     </select>
 
     <select id="getDepartmentByName" resultType="com.example.nngkxxdp.entity.Department">
@@ -551,6 +554,152 @@
             </if>
         </where>
     </select>
+    <select id="getDeptById" resultType="com.example.nngkxxdp.entity.Department">
+        SELECT
+        deptid,
+        deptname,
+        sortid,
+        base_score,
+        dept_url,
+        short_name,
+        leaderperson,
+        leaderphone,
+        workperson,
+        workphone,
+        main_leader,
+        main_leader_phone
+        FROM t_dept
+        <where>
+            1=1
+            <if test="deptid != null">
+                AND deptid =#{deptid}
+            </if>
+            <if test="is_deleted != null">
+                AND is_deleted =#{is_deleted}
+            </if>
+        </where>
+    </select>
+    <select id="getDepartmentByNameId" resultType="com.example.nngkxxdp.entity.Department">
+        select *
+        from t_dept
+        <where>
+            1=1
+            <if test="deptid != null">
+                AND deptid !=#{deptid}
+            </if>
+            <if test="deptname != null">
+                AND deptname =#{deptname}
+            </if>
+        </where>
+    </select>
+    <select id="getChnlidByChnlid" resultType="java.util.Map">
+        SELECT
+        id,
+        deptid,
+        chnlid
+        FROM
+        t_dept_chnlid
+        <where>
+            1=1
+            <if test="chnlid != null">
+                AND chnlid =#{chnlid}
+            </if>
+        </where>
+    </select>
+    <select id="getNotVestedChnlidCount" resultType="java.lang.Long">
+        SELECT
+        count( a.chnlid )
+        FROM
+        ( SELECT chnlid, CHNLIDNAME FROM save_hlw_interface_data GROUP BY CHNLID ) a
+        <where>
+            a.chnlid NOT IN ( SELECT CHNLID FROM t_dept_chnlid )
+            <if test="chnlid != null">
+                AND a.CHNLID LIKE CONCAT('%', #{chnlid}, '%')
+            </if>
+            <if test="chnlidName != null">
+                AND a.CHNLIDNAME LIKE CONCAT('%', #{chnlidName}, '%')
+            </if>
+        </where>
+    </select>
+    <select id="getNotVestedChnlid" resultType="java.util.Map">
+        SELECT a.chnlid,
+        a.CHNLIDNAME,
+        a.DOCPUBURL,
+        a.DOCRELTIME
+        FROM (SELECT chnlid, CHNLIDNAME, DOCPUBURL, DOCRELTIME FROM save_hlw_interface_data GROUP BY CHNLID) a
+        <where>
+            a.chnlid NOT IN ( SELECT CHNLID FROM t_dept_chnlid )
+            <if test="chnlid != null">
+                AND a.CHNLID LIKE CONCAT('%', #{chnlid}, '%')
+            </if>
+            <if test="chnlidName != null">
+                AND a.CHNLIDNAME LIKE CONCAT('%', #{chnlidName}, '%')
+            </if>
+        </where>
+        limit #{startRows},#{limit}
+    </select>
+    <select id="getChnlidAllCount" resultType="java.lang.Long">
+        SELECT
+        count( d.chnlid )
+        FROM
+        (
+        SELECT
+        a.deptid,
+        c.deptname,
+        a.chnlid,
+        b.CHNLIDNAME
+        FROM
+        ( SELECT deptid, chnlid FROM t_dept_chnlid ) a
+        LEFT JOIN ( SELECT chnlid, CHNLIDNAME FROM save_hlw_interface_data GROUP BY chnlid ) b ON a.chnlid = b.chnlid
+        LEFT JOIN t_dept c ON a.deptid = c.deptid
+        ) d
+        <where>
+            1=1
+            <if test="deptName != null">
+                AND d.deptname LIKE CONCAT('%', #{deptName}, '%')
+            </if>
+            <if test="chnlid != null">
+                AND d.chnlid LIKE CONCAT('%', #{chnlid}, '%')
+            </if>
+            <if test="chnlidName != null">
+                AND d.CHNLIDNAME LIKE CONCAT('%', #{chnlidName}, '%')
+            </if>
+        </where>
+    </select>
+    <select id="getChnlidListPage" resultType="java.util.Map">
+        SELECT
+        d.id,
+        d.deptid,
+        d.deptname,
+        d.chnlid,
+        d.CHNLIDNAME
+        FROM
+        (
+        SELECT
+        a.id,
+        a.deptid,
+        c.deptname,
+        a.chnlid,
+        b.CHNLIDNAME
+        FROM
+        ( SELECT id, deptid, chnlid FROM t_dept_chnlid ) a
+        LEFT JOIN ( SELECT chnlid, CHNLIDNAME FROM save_hlw_interface_data GROUP BY chnlid ) b ON a.chnlid = b.chnlid
+        LEFT JOIN t_dept c ON a.deptid = c.deptid
+        ) d
+        <where>
+            1=1
+            <if test="deptName != null">
+                AND d.deptname LIKE CONCAT('%', #{deptName}, '%')
+            </if>
+            <if test="chnlid != null">
+                AND d.chnlid LIKE CONCAT('%', #{chnlid}, '%')
+            </if>
+            <if test="chnlidName != null">
+                AND d.CHNLIDNAME LIKE CONCAT('%', #{chnlidName}, '%')
+            </if>
+        </where>
+        limit #{startRows},#{limit}
+    </select>
 
     <insert id="saveDept" parameterType="com.example.nngkxxdp.entity.Department">
         INSERT INTO t_dept (deptname, sortid, base_score, dept_url, short_name,
@@ -569,6 +718,36 @@
                 #{mainLeaderPhone},
                 #{isDeleted})
     </insert>
+    <insert id="saveChnlid">
+        INSERT INTO t_dept_chnlid (deptid,
+                                   chnlid,
+                                   is_deleted)
+        VALUES (#{deptid},
+                #{chnlid},
+                #{is_deleted})
+    </insert>
+
+    <update id="updateDeptById">
+        UPDATE t_dept SET
+        deptname=#{deptname},
+        sortid=#{sortid},
+        base_score=#{baseScore},
+        dept_url=#{deptUrl},
+        short_name=#{shortName},
+        leaderperson=#{leaderperson},
+        leaderphone=#{leaderphone},
+        workperson=#{workperson},
+        workphone=#{workphone},
+        main_leader=#{mainLeader},
+        main_leader_phone=#{mainLeaderPhone},
+        is_deleted=#{isDeleted}
+        <where>
+            1=1
+            <if test="deptid != null">
+                AND deptid =#{deptid}
+            </if>
+        </where>
+    </update>
 
     <delete id="deleteRecord">
         DELETE
@@ -582,5 +761,35 @@
         FROM t_dept_record
         WHERE month_time = #{thisMonth};
     </delete>
+    <update id="deleteChnlidById">
+        UPDATE t_dept_chnlid SET
+        is_deleted=#{deleted}
+        <where>
+            1=1
+            <if test="id != null">
+                AND id =#{id}
+            </if>
+        </where>
+    </update>
+    <update id="deleteDeptById">
+        UPDATE t_dept SET
+        is_deleted=#{deleted}
+        <where>
+            1=1
+            <if test="deptid != null">
+                AND deptid =#{deptid}
+            </if>
+        </where>
+    </update>
+    <update id="updateChnlidBelong">
+        UPDATE t_dept_chnlid SET
+        deptid=#{deptid}
+        <where>
+            1=1
+            <if test="id != null">
+                AND id =#{id}
+            </if>
+        </where>
+    </update>
 
 </mapper>