elink-star
/
epdc-cloud-admin-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

人房管理代码迁移

feature/codemove
wanggongfeng 3 years ago
parent
c790caa4c0
commit
2fc5bcc537
5 changed files with 99 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
  2. 6
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
  3. 4
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
  4. 28
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
  5. 46
      epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml

15
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
View File

@ -24,6 +24,8 @@ import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptAreaCodeFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
import com.elink.esua.epdc.dto.form.DeptInfoFormDTO;
import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService;
import com.elink.esua.epdc.service.SysDeptService;
import io.swagger.annotations.Api;
@ -413,5 +415,18 @@ public class SysDeptController {
return new Result<AllDeptDTO>().ok(data);
}
/**
* @param formDTO
* @Author: wgf
* @Note: 根据标签或者父id查询部门列表信息
* @Date: 13:42 2022/05/30
* @Modified by:
*/
@GetMapping("deptInfo")
public Result<List<DeptInfoResultDTO>> deptInfo(DeptInfoFormDTO formDTO) {
List<DeptInfoResultDTO> list = sysDeptService.deptInfo(formDTO);
return new Result<List<DeptInfoResultDTO>>().ok(list);
}
}

6
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
View File

@ -15,6 +15,8 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
import com.elink.esua.epdc.dto.form.DeptInfoFormDTO;
import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -234,5 +236,9 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
*/
AllDeptDTO getDeptInfoByName(@Param("gridName") String gridName);
SysDeptEntity selectDeptPidByDeptId(@Param("agencyId") Long agencyId);
List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO);
}

4
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
View File

@ -18,6 +18,8 @@ import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptAreaCodeFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
import com.elink.esua.epdc.dto.form.DeptInfoFormDTO;
import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
import java.util.List;
@ -321,4 +323,6 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
* @date 2021/11/22 14:53
*/
AllDeptDTO getAllDeptInfoByName(String gridName);
List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO);
}

28
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
View File

@ -44,6 +44,8 @@ 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.dto.form.DeptInfoFormDTO;
import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
import com.elink.esua.epdc.entity.AdminImgEntity;
import com.elink.esua.epdc.entity.SysDeptEntity;
import com.elink.esua.epdc.entity.SysDeptInfoEntity;
@ -1152,4 +1154,30 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
return baseDao.getDeptInfoByName(gridName);
}
@Override
public List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO) {
long countryId = 370124L;
if (SecurityUser.getUser().getSuperAdmin() != NumConstant.ONE && countryId != SecurityUser.getUser().getDeptId()) {
List<Long> deptIdList = SecurityUser.getUser().getDeptIdList();
if (SecurityUser.getUser().getDeptId() != null) {
SysDeptEntity deptEntity = baseDao.selectDeptPidByDeptId(SecurityUser.getUser().getDeptId());
// 如果这是网格员，就将社区ID放进权限（更高级部门也是）
if (deptEntity != null) {
deptIdList.add(deptEntity.getId());
SysDeptEntity pDeptEntity = baseDao.selectDeptPidByDeptId(deptEntity.getId());
// 如果这是网格员，还要将街道ID放进权限（更高级部门也是）
if (pDeptEntity != null) {
deptIdList.add(pDeptEntity.getId());
}
}
// 将所属部门的权限也放进来
SysDeptEntity entity = baseDao.getById(SecurityUser.getUser().getDeptId());
deptIdList.add(entity.getId());
}
formDTO.setDeptIdList(deptIdList);
}
return baseDao.deptInfo(formDTO);
}
}

46
epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
View File

@ -400,4 +400,50 @@
grid.tags LIKE '%grid_party%'
AND grid.name = #{gridName}
</select>
<select id="selectDeptPidByDeptId" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
SELECT
p.*
FROM
sys_dept d
LEFT JOIN sys_dept p ON p.id = d.pid
WHERE
d.id = #{agencyId}
AND p.pid != 0
</select>
<select id="deptInfo" resultType="com.elink.esua.epdc.dto.result.DeptInfoResultDTO">
SELECT
d.id,
d.pid,
d.`NAME` AS NAME,
d.sort,
d.create_date,
d.type_key as tags,
d.area_code,
d.id as deptId,
p.id AS dept_pid
FROM
sys_dept d
LEFT JOIN sys_dept p ON d.pid = p.id
<where>
<if test="tags!=null and tags!=''">
d.type_key = #{tags}
</if>
<if test="pid!=null and pid!=''">
and d.pid =#{pid}
</if>
<if test="deptPid!=null and deptPid!=''">
and p.id =#{deptPid}
</if>
<if test="deptIdList!=null and deptIdList.size() > 0">
and d.id in
<foreach collection="deptIdList" item="deptId" separator="," open="(" close=")">
#{deptId}
</foreach>
</if>
</where>
ORDER BY
d.sort,d.id,d.create_date DESC
</select>
</mapper>

Write Preview
Loading…
Cancel
Save