3.5增加登录验证、修改密码、人员列表调整

mitao

2025-03-14 08f1b1f1804a8bd833d42f257908d80e88387b55

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

@@ -5,8 +5,10 @@
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IClassifyAdministrationService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +17,7 @@
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;


@@ -29,6 +32,10 @@

    @Autowired(required = true)
    IClassifyAdministrationService iClassifyAdministrationService;

    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;

    /**
     * 获取管理菜单列表
     * @return
@@ -70,13 +77,14 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "name",required = false) String name)
                                          @RequestParam(value = "name",required = false) String name,
                                          @RequestParam(value = "classifyGrade",required = false) String classifyGrade)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<ClassifyAdministration> pageParam = new Page<>(pageNum,pageSize);
        List<ClassifyAdministration> list = iClassifyAdministrationService.selectConfigList(pageParam,pageSize,name,"");
        int num=iClassifyAdministrationService.countNum(name,"");
        List<ClassifyAdministration> list = iClassifyAdministrationService.selectConfigList(pageParam,pageSize,name,classifyGrade);
        int num=iClassifyAdministrationService.countNum(name,classifyGrade);
        return getDataTable(list,num);
    }

@@ -127,6 +135,24 @@
        {
            return ResultData.error("id 不能为空");
        }

        /**
         * 根据上级id查询子分类
         * @param parentId
         * @return
         */
        List<String> list=iClassifyAdministrationService.selectParent(Id);
        if(list!=null && list.size()>0)
        {
            return ResultData.error("请先删除其下的二级分类");
        }

        List<String> listIds=iTransactionEventService.selectclassifyId(Id);
        if(listIds!=null && listIds.size()>0)
        {
            return ResultData.error("分类下有办事指南！不能删除");
        }

        return toAjax(iClassifyAdministrationService.deleteConfigById(Id));
    }

@@ -144,8 +170,22 @@



    /**
     * 树状分类选择列表
     * @return
     */
    @ApiOperation("树状分类选择列表")
    @GetMapping("/getClassifyList")
    public TableDataInfo getClassifyList()
    {
        List<ClassifyAdministration> list=iClassifyAdministrationService.selectConfigList("","1");


        for(ClassifyAdministration entity:list)
        {
            entity.setClassifyAdministrationEntityList(iClassifyAdministrationService.selectParentData(entity.getId()+""));
        }
        return getDataTable(list);
    }