Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-09 0e2d23c4ff1f12413ac9fe34632ef3d72e7e7d9e

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -84,15 +84,13 @@
     */
    @ApiOperation("删除机构")
    @DeleteMapping("/delete")
    @Authorization
//    @Authorization
    public ResultData deleteConfigById(@RequestParam(value = "Id",required = false)  String Id)
    {
        Assert.notNull(Id, "Id 不能为空");
        OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
        List<OrganizationChartEntity> list=iOrganizationChartService.selectParentList(Id,"");

        List<OrganizationChartEntity> list=iOrganizationChartService.selectConfigList(entity.getId()+"","");

        if(list.size()>0)
        if(list!=null && list.size()>0)
        {
            return ResultData.error("该机构下存在其他部门！请先删除子部门");
        }
@@ -144,7 +142,7 @@
    public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
    {
        List<OrganizationChartEntity> ids=new ArrayList<>();
        List<OrganizationChartEntity> lists = iOrganizationChartService.selectConfigList(departmentId,"");
        List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
        if(lists.size()<1)
        {
            lists.add(iOrganizationChartService.selectConfigById(departmentId));

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -50,7 +50,7 @@

        SysUser user=null;
        //管理员登录
        if(!StringUtils.isEmpty(account))
        if(StringUtils.equals("zigonggaoadmin",account))
        {
            user= IUserService.getUserByAccount(account);

@@ -109,7 +109,6 @@
        }

        String token = tokenManager.getTokenByUserId(user.getUserId());
//        String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
        System.out.println("token "+token);
        if (token == null) {
            //生成一个token，保存用户登录状态

 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java

@@ -41,6 +41,7 @@
            //从数据库中查询并返回
            return userService.selectData(currentUserId+"");
        }
        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
        return null;
//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
    }
}

 flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java

@@ -62,5 +62,12 @@
    List<String> getIds(String id);


    /**
     * 根据id  查询是否有子部门
     * @param parentId
     * @param grade
     * @return
     */
    public List<OrganizationChartEntity> selectParentList(String parentId,String grade);

}

 flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java

@@ -113,6 +113,11 @@
        return ids;
    }

    @Override
    public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
        return baseMapper.selectConfigList(parentId,grade);
    }

    //递归取id
    private List<String> disposestreetId(List<OrganizationChartEntity> lists)
    {