diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java
new file mode 100644
index 0000000..04ca721
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java
@@ -0,0 +1,88 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = adminImgService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ AdminImgDTO data = adminImgService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody AdminImgDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ adminImgService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody AdminImgDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ adminImgService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ adminImgService.delete(ids);
+ return new Result();
+ }
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java
new file mode 100644
index 0000000..9f8a7fc
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = partyOrgService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ PartyOrgDTO data = partyOrgService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody PartyOrgDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ partyOrgService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody PartyOrgDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ partyOrgService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ partyOrgService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partyOrgService.selectListPartyOrg(params);
+ ExcelUtils.exportExcelToTarget(response, "党组织管理", list, PartyOrgExcel.class);
+ }
+
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java
new file mode 100644
index 0000000..7cf7ab5
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = partyOrgTypeService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ PartyOrgTypeDTO data = partyOrgTypeService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody PartyOrgTypeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ partyOrgTypeService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody PartyOrgTypeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ partyOrgTypeService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ partyOrgTypeService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partyOrgTypeService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgTypeExcel.class);
+ }
+
+ /*
+ * 获取 党组织类型，用于下拉选项
+ * @param
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author zhangyong
+ * @Date 15:28 2021-08-06
+ **/
+ @GetMapping("getPartyOrgType")
+ public Result> getPartyOrgType() {
+ return new Result>().ok(partyOrgTypeService.getPartyOrgType());
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java
new file mode 100644
index 0000000..66189f9
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java
@@ -0,0 +1,88 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = sysDeptInfoService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ SysDeptInfoDTO data = sysDeptInfoService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody SysDeptInfoDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ sysDeptInfoService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody SysDeptInfoDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ sysDeptInfoService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ sysDeptInfoService.delete(ids);
+ return new Result();
+ }
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java
index 838ff06..ba85c17 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java
@@ -158,4 +158,16 @@ public class SysRoleController {
return new Result();
}
+ /**
+ * @describe: 根据用户ID查询角色ID，用逗号隔开
+ * @author wangtong
+ * @date 2021/8/10 16:05
+ * @params [userId]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ */
+ @GetMapping("getRoleStringIdsByUserId/{userId}")
+ public Result getRoleStringIdsByUserId(@PathVariable("userId") Long userId) {
+ String roleStringList = sysRoleService.getRoleStringIdsByUserId(userId);
+ return new Result().ok(roleStringList);
+ }
}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java
index 6aceee1..69e876d 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java
@@ -61,6 +61,8 @@ public class SysRoleV2Controller {
data.setCategoryIdList(sysRoleService.getCategoryIdList(id));
//查询角色对应的吹哨部门
data.setWhistleDeptIdList(sysRoleService.getWhistleDeptIdList(id));
+ //查询角色对应的栏目权限
+ data.setModuleMenuIdList(sysRoleService.getModuleMenuIdList(id));
return new Result().ok(data);
}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java
new file mode 100644
index 0000000..7746cc1
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java
new file mode 100644
index 0000000..09ccbb6
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 是否存在该类型（partyOrgType）的党组织
+ *
+ * @param typeCode
+ * @return java.lang.Integer
+ * @Author zhangyong
+ * @Date 14:34 2021-08-06
+ **/
+ Integer isPartyOrgExistByPartyOrgType(@Param("typeCode") String typeCode);
+
+ /**
+ * PC 首页查询
+ *
+ * @param params
+ * @return java.util.List
+ * @Author zhangyong
+ * @Date 15:21 2021-08-11
+ **/
+ List selectListPartyOrg(Map params);
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java
new file mode 100644
index 0000000..61ebd3d
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 返回值 >0 code 已经存在
+ *
+ * @param typeCode
+ * @param id 过滤自身(可选项)
+ * @return java.lang.Integer
+ * @Author zhangyong
+ * @Date 10:55 2021-04-28
+ **/
+ Integer isTypeCodeRepeated(@Param("typeCode") String typeCode, @Param("id") String id);
+
+ /**
+ * 返回值 >0 name 已经存在
+ *
+ * @param typeName
+ * @param id 过滤自身(可选项)
+ * @return java.lang.Integer
+ * @Author zhangyong
+ * @Date 10:55 2021-04-28
+ **/
+ Integer isTypeNameRepeated(@Param("typeName") String typeName, @Param("id") String id);
+
+ /*
+ * 获取 党组织类型，用于下拉选项
+ * @param
+ * @return java.util.List
+ * @Author zhangyong
+ * @Date 15:28 2021-08-06
+ **/
+ List getPartyOrgType();
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java
new file mode 100644
index 0000000..da3595b
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java
index 1310c61..42759fc 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java
@@ -8,7 +8,6 @@
package com.elink.esua.epdc.dao;
-import com.elink.esua.epdc.entity.SysRoleEntity;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.entity.SysRoleEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -36,4 +35,13 @@ public interface SysRoleDao extends BaseDao {
* @date 2019/12/18 10:20
*/
List> selectAmountByRoleTpye(@Param("roleType") String roleType, @Param("deptIdList") List deptIdList);
+
+ /**
+ * @describe: 根据用户ID查询角色ID，用逗号隔开
+ * @author wangtong
+ * @date 2021/8/10 16:05
+ * @params [userId]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ */
+ String getRoleStringIdsByUserId(@Param("userId") Long userId);
}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java
new file mode 100644
index 0000000..774d088
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see >
+ */
+ @GetMapping(value = "news/rolemodule/getModuleMenuIdList/{roleId}")
+ Result> getModuleMenuIdList(@PathVariable("roleId") Long roleId);
+
+ /**
+ * @param orgTypeFormDTO
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 保存项目处理类型权限
+ * @Date 2019/12/24 17:17
+ **/
+ @PutMapping(value = "news/rolemodule/updateRoleModuleRealation", consumes = MediaType.APPLICATION_JSON_VALUE)
+ Result updateRoleModuleRealation(RoleModuleRealationDTO moduleDto);
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java
new file mode 100644
index 0000000..c66cfa6
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java
@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.RoleModuleRealationDTO;
+import com.elink.esua.epdc.feign.NewsFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2019/12/24 9:45
+ */
+@Component
+public class NewsFeignClientFallback implements NewsFeignClient {
+
+
+ @Override
+ public Result saveRoleModuleRealation(RoleModuleRealationDTO moduleDto) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "saveRoleModuleRealation", moduleDto);
+ }
+
+ @Override
+ public Result> getModuleMenuIdList(Long roleId) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getModuleMenuIdList", roleId);
+ }
+
+ @Override
+ public Result updateRoleModuleRealation(RoleModuleRealationDTO moduleDto) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "updateRoleModuleRealation", moduleDto);
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgRedis.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgRedis.java
new file mode 100644
index 0000000..ee6a0f4
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2021-08-10
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2021-08-10
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return AdminImgDTO
+ * @author generator
+ * @date 2021-08-10
+ */
+ AdminImgDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2021-08-10
+ */
+ void save(AdminImgDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2021-08-10
+ */
+ void update(AdminImgDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2021-08-10
+ */
+ void delete(String[] ids);
+
+
+
+ /***
+ * 根据类型 +引用ID
+ * @param imgType
+ * @param referenceId
+ * @return com.elink.esua.epdc.dto.AdminImgDTO
+ * @author qushutong
+ * @date 2021/8/10 17:20
+ */
+ AdminImgDTO getDtoByReference(String imgType,String referenceId);
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java
new file mode 100644
index 0000000..3ed40df
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2021-08-06
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2021-08-06
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return PartyOrgDTO
+ * @author generator
+ * @date 2021-08-06
+ */
+ PartyOrgDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2021-08-06
+ */
+ void save(PartyOrgDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2021-08-06
+ */
+ void update(PartyOrgDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2021-08-06
+ */
+ void delete(String[] ids);
+
+ /**
+ * PC 首页查询
+ *
+ * @param params
+ * @return java.util.List
+ * @Author zhangyong
+ * @Date 15:21 2021-08-11
+ **/
+ List selectListPartyOrg(Map params);
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java
new file mode 100644
index 0000000..e9a8056
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2021-08-06
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2021-08-06
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return PartyOrgTypeDTO
+ * @author generator
+ * @date 2021-08-06
+ */
+ PartyOrgTypeDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2021-08-06
+ */
+ void save(PartyOrgTypeDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2021-08-06
+ */
+ void update(PartyOrgTypeDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2021-08-06
+ */
+ void delete(String[] ids);
+
+ /*
+ * 获取 党组织类型，用于下拉选项
+ * @param
+ * @return java.util.List
+ * @Author zhangyong
+ * @Date 15:28 2021-08-06
+ **/
+ List getPartyOrgType();
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java
new file mode 100644
index 0000000..25c4054
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2021-08-10
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2021-08-10
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return SysDeptInfoDTO
+ * @author generator
+ * @date 2021-08-10
+ */
+ SysDeptInfoDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2021-08-10
+ */
+ void save(SysDeptInfoDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2021-08-10
+ */
+ void update(SysDeptInfoDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2021-08-10
+ */
+ void delete(String[] ids);
+
+ /**
+ * 根据关联deptID 查询
+ *
+ * @param deptId
+ * @return SysDeptInfoDTO
+ * @author generator
+ * @date 2021-08-10
+ */
+ SysDeptInfoDTO getDeptInfoByDeptID(String deptId);
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java
index 91a6af9..6b27e37 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java
@@ -42,4 +42,21 @@ public interface SysRoleService extends BaseService {
List getWhistleDeptIdList(Long id);
+ /**
+ * @describe: 根据用户ID查询角色ID，用逗号隔开
+ * @author wangtong
+ * @date 2021/8/10 16:05
+ * @params [userId]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ */
+ String getRoleStringIdsByUserId(Long userId);
+
+ /**
+ * @describe: 查询角色对应的栏目权限
+ * @author wangtong
+ * @date 2021/8/11 16:07
+ * @params [id]
+ * @return java.util.List
+ */
+ List getModuleMenuIdList(Long id);
}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java
new file mode 100644
index 0000000..503a409
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements AdminImgService {
+
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, AdminImgDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, AdminImgDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public AdminImgDTO get(String id) {
+ AdminImgEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, AdminImgDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(AdminImgDTO dto) {
+ AdminImgEntity entity = ConvertUtils.sourceToTarget(dto, AdminImgEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(AdminImgDTO dto) {
+ AdminImgEntity entity = ConvertUtils.sourceToTarget(dto, AdminImgEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ @Override
+ public AdminImgDTO getDtoByReference(String imgType, String referenceId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(referenceId), FieldConstant.REFERENCE_ID, referenceId);
+ wrapper.eq(StringUtils.isNotBlank(imgType), FieldConstant.IMG_TYPE, imgType);
+ return ConvertUtils.sourceToTarget(baseDao.selectOne(wrapper),AdminImgDTO.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java
new file mode 100644
index 0000000..5b80de8
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements PartyOrgService {
+
+ @Autowired
+ private PartyOrgRedis partyOrgRedis;
+ @Autowired
+ private OptSysDeptService optSysDeptService;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = getPage(params);
+ List list = baseDao.selectListPartyOrg(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, PartyOrgDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public PartyOrgDTO get(String id) {
+ PartyOrgEntity entity = baseDao.selectById(id);
+ PartyOrgDTO dto = ConvertUtils.sourceToTarget(entity, PartyOrgDTO.class);
+ if (null != dto && null != dto.getAllDeptIds()) {
+ String[] split = dto.getAllDeptIds().split(",");
+ // 去除，顶级组织
+ String[] allDeptIdArr = new String[split.length - NumConstant.ONE];
+ System.arraycopy(split, NumConstant.ONE, allDeptIdArr, NumConstant.ZERO,split.length - NumConstant.ONE);
+ dto.setAllDeptIdArr(allDeptIdArr);
+ }
+ return dto;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(PartyOrgDTO dto) {
+ PartyOrgEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgEntity.class);
+ this.packageOrgLevel(entity, Long.valueOf(dto.getDeptId()));
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(PartyOrgDTO dto) {
+ PartyOrgEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgEntity.class);
+ this.packageOrgLevel(entity, Long.valueOf(dto.getDeptId()));
+ updateById(entity);
+ }
+
+ /**
+ * 组装部门层级
+ *
+ * @param entity
+ * @param deptId
+ * @return void
+ * @Author zhangyong
+ * @Date 16:25 2021-08-06
+ **/
+ private void packageOrgLevel(PartyOrgEntity entity, Long deptId) {
+ DeptLevelAndLeaderDTO deptLevel = optSysDeptService.getDeptLevelById(deptId);
+ entity.setAllDeptIds(deptLevel.getAllDeptIds());
+ entity.setAllDeptNames(deptLevel.getAllDeptNames());
+ entity.setParentDeptIds(deptLevel.getParentDeptIds());
+ entity.setParentDeptNames(deptLevel.getParentDeptNames());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ @Override
+ public List selectListPartyOrg(Map params) {
+ return baseDao.selectListPartyOrg(params);
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java
new file mode 100644
index 0000000..f39b9a1
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java
@@ -0,0 +1,143 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements PartyOrgTypeService {
+
+ @Autowired
+ private PartyOrgTypeRedis partyOrgTypeRedis;
+ @Autowired
+ private PartyOrgDao partyOrgDao;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, PartyOrgTypeDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, PartyOrgTypeDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+ wrapper.orderByAsc("SORT");
+ return wrapper;
+ }
+
+ @Override
+ public PartyOrgTypeDTO get(String id) {
+ PartyOrgTypeEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, PartyOrgTypeDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(PartyOrgTypeDTO dto) {
+ Integer num = baseDao.isTypeCodeRepeated(dto.getTypeCode(), null);
+ this.exceptionHandling(num, "党组织类型编码");
+ num = baseDao.isTypeNameRepeated(dto.getTypeName(), null);
+ this.exceptionHandling(num, "党组织类型");
+
+ PartyOrgTypeEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgTypeEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(PartyOrgTypeDTO dto) {
+ Integer num = baseDao.isTypeCodeRepeated(dto.getTypeCode(), dto.getId());
+ this.exceptionHandling(num, "党组织类型编码 不可重复！");
+ num = baseDao.isTypeNameRepeated(dto.getTypeName(), dto.getId());
+ this.exceptionHandling(num, "党组织类型 不可重复！");
+
+ PartyOrgTypeEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgTypeEntity.class);
+ updateById(entity);
+ }
+
+ /**
+ * 异常处理
+ * @param num > 0 输出异常
+ * @param exceptionInfo 异常描述
+ * @return void
+ * @Author zhangyong
+ * @Date 14:26 2021-08-06
+ **/
+ private void exceptionHandling(Integer num, String exceptionInfo) {
+ if (NumConstant.ZERO < num) {
+ throw new RenException(exceptionInfo);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ for (String id : ids) {
+ PartyOrgTypeEntity partyOrgTypeEntity = baseDao.selectById(id);
+ Integer num = partyOrgDao.isPartyOrgExistByPartyOrgType(partyOrgTypeEntity.getTypeCode());
+ this.exceptionHandling(num, "该类型不能被删除，因当前尚存在该类型的党组织。");
+ }
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ @Override
+ public List getPartyOrgType() {
+ return baseDao.getPartyOrgType();
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java
new file mode 100644
index 0000000..1034986
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java
@@ -0,0 +1,109 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements SysDeptInfoService {
+
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, SysDeptInfoDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, SysDeptInfoDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public SysDeptInfoDTO get(String id) {
+ SysDeptInfoEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, SysDeptInfoDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(SysDeptInfoDTO dto) {
+ SysDeptInfoEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptInfoEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(SysDeptInfoDTO dto) {
+ SysDeptInfoEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptInfoEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ @Override
+ public SysDeptInfoDTO getDeptInfoByDeptID(String deptId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(deptId), FieldConstant.DEPT_ID, deptId);
+ SysDeptInfoEntity sysDeptInfoEntity = baseDao.selectOne(wrapper);
+ return ConvertUtils.sourceToTarget(sysDeptInfoEntity,SysDeptInfoDTO.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index a58f161..a7fcc98 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
+import com.elink.esua.epdc.constant.ImgConstant;
import com.elink.esua.epdc.constant.RoleTypeKeyConstant;
import com.elink.esua.epdc.dao.SysDeptDao;
import com.elink.esua.epdc.dto.*;
@@ -42,11 +43,15 @@ import com.elink.esua.epdc.dto.epdc.result.AreaCodeChildResultDTO;
import com.elink.esua.epdc.dto.epdc.result.AreaCodeParentResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptAreaCodeResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.entity.AdminImgEntity;
import com.elink.esua.epdc.entity.SysDeptEntity;
+import com.elink.esua.epdc.entity.SysDeptInfoEntity;
import com.elink.esua.epdc.feign.AnalysisFeignClient;
import com.elink.esua.epdc.feign.GroupFeignClient;
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.rocketmq.producer.OrganizationModifyProducer;
+import com.elink.esua.epdc.service.AdminImgService;
+import com.elink.esua.epdc.service.SysDeptInfoService;
import com.elink.esua.epdc.service.SysDeptService;
import com.elink.esua.epdc.service.SysUserService;
import com.elink.esua.epdc.utils.EpmetUtils;
@@ -93,6 +98,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl list(Map params) {
//普通管理员，只能查询所属部门及子部门的数据
@@ -126,10 +137,35 @@ public class SysDeptServiceImpl extends BaseServiceImpl
+ * @return java.util.Map
* @author work@yujt.net.cn
* @date 2019/11/29 10:27
*/
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
index 0063ca5..7cd8050 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
@@ -28,6 +28,7 @@ import com.elink.esua.epdc.constant.RoleTypeKeyConstant;
import com.elink.esua.epdc.dao.SysDeptDao;
import com.elink.esua.epdc.dao.SysRoleDao;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.RoleModuleRealationDTO;
import com.elink.esua.epdc.dto.SysRoleDTO;
import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO;
import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO;
@@ -35,6 +36,7 @@ import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
import com.elink.esua.epdc.entity.SysRoleEntity;
import com.elink.esua.epdc.feign.EventFeignClient;
+import com.elink.esua.epdc.feign.NewsFeignClient;
import com.elink.esua.epdc.service.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +73,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl page(Map params) {
@@ -149,6 +153,12 @@ public class SysRoleServiceImpl extends BaseServiceImpl getModuleMenuIdList(Long id) {
+ Result> result = newsFeignClient.getModuleMenuIdList(id);
+ return result.getData();
+ }
+
/**
* @param roleId
* @param whistleDeptIdList
diff --git a/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml b/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml
new file mode 100644
index 0000000..4a0cb37
--- /dev/null
+++ b/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml
new file mode 100644
index 0000000..c658311
--- /dev/null
+++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+ SELECT
+ COUNT(1)
+ FROM epdc_party_org
+ WHERE DEL_FLAG = '0'
+ AND TYPE_CODE = #{typeCode}
+
+
+
+ SELECT
+ o.ID id,
+ REPLACE(o.ALL_DEPT_NAMES, '平阴县-', '') allDeptNames,
+ o.PARTY_ORG_NAME partyOrgName,
+ t.TYPE_NAME typeName
+ FROM epdc_party_org o
+ LEFT JOIN epdc_party_org_type t ON o.TYPE_CODE = t.TYPE_CODE AND t.DEL_FLAG ='0'
+ WHERE o.DEL_FLAG ='0'
+
+ AND o.ALL_DEPT_IDS LIKE CONCAT( '%', #{deptId}, '%' )
+
+
+ AND o.PARTY_ORG_NAME LIKE CONCAT( '%', #{partyOrgName}, '%' )
+
+ ORDER BY o.CREATED_TIME DESC
+
+
diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml
new file mode 100644
index 0000000..7af2277
--- /dev/null
+++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+ SELECT
+ COUNT(1)
+ FROM epdc_party_org_type
+ WHERE DEL_FLAG = '0'
+ AND TYPE_CODE = #{typeCode}
+
+ AND ID != #{id}
+
+
+
+
+ SELECT
+ COUNT(1)
+ FROM epdc_party_org_type
+ WHERE DEL_FLAG = '0'
+ AND TYPE_NAME = #{typeName}
+
+ AND ID != #{id}
+
+
+
+
+ SELECT
+ TYPE_CODE tagValue,
+ TYPE_NAME tagName
+ FROM epdc_party_org_type
+ WHERE DEL_FLAG = '0'
+ AND ENABLE = '1'
+
+
diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml
new file mode 100644
index 0000000..a326a86
--- /dev/null
+++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysRoleDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysRoleDao.xml
index c8cc9d1..110f9d2 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/SysRoleDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/SysRoleDao.xml
@@ -18,4 +18,8 @@
GROUP BY
d.id
+
+ SELECT GROUP_CONCAT(role_id) FROM `sys_role_user`
+ where user_id=#{userId}
+
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 982b1ff..c660ca3 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 982b1ff01e69e7cb48180e3d68c94664605ae73e
+Subproject commit c660ca360356218f48dbdb987f4fba70f7642435
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 5b077ff..235f56d 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 5b077ffda98e46ce47e9c5540dabbc50f092968d
+Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155