lidongdong
2022-10-19 a3a02ab1024440d271ada568aea7f7e08af27c53
修改【角色管理】无法搜索  bug
6个文件已修改
42 ■■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleManagementMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/RoleManagementMapper.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/RoleMenuMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
@@ -33,7 +33,8 @@
    @GetMapping("/getList")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "name",required = false) String name)
    {
        if(pageNum==null)
        {
@@ -46,9 +47,9 @@
        }
        Page<RoleManagementEntity> pageParam = new Page<>(pageNum,pageSize);
        List<RoleManagementEntity> list = iRoleManagementService.selectConfigList(pageParam,pageSize);
        List<RoleManagementEntity> list = iRoleManagementService.selectConfigList(pageParam,pageSize,name);
        int num=iRoleManagementService.countNum();
        int num=iRoleManagementService.countNum(name);
        return getDataTable(list,num);
    }
flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleManagementMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.db.gen.entity.RoleManagementEntity;
import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -17,7 +18,8 @@
     * @param state
     * @return
     */
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state);
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state,
                                                       @Param("name") String name);
    /**
     * 新增角色
@@ -44,7 +46,7 @@
     * 统计条数
     * @return
     */
    public int countNum();
    public int countNum(String name);
flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java
@@ -13,7 +13,8 @@
     * @param state
     * @return
     */
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state);
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page,
                                                       Integer state,String name);
    /**
     * 新增角色
@@ -40,5 +41,5 @@
     * 统计条数
     * @return
     */
    public int countNum();
    public int countNum(String name);
}
flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java
@@ -12,8 +12,8 @@
@Service
public class RoleManagementImpl extends ServiceImpl<RoleManagementMapper, RoleManagementEntity> implements IRoleManagementService {
    @Override
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state) {
        return baseMapper.selectConfigList(page,state);
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state,String name) {
        return baseMapper.selectConfigList(page,state,name);
    }
    @Override
@@ -32,7 +32,7 @@
    }
    @Override
    public int countNum() {
        return baseMapper.countNum();
    public int countNum(String name) {
        return baseMapper.countNum(name);
    }
}
flower_city/src/main/resources/mapper/RoleManagementMapper.xml
@@ -28,10 +28,10 @@
    <select id="selectConfigList"  resultMap="RoleManagementEntityResult">
        <include refid="selectRoleManagementEntityVo"/>
        <!--        <where>-->
        <!--            <if test="userName != null and userName != ''">-->
        <!--                AND user_name like concat('%', #{userName}, '%')-->
        <!--            </if>-->
        <where>
            <if test="name!=null and name!=''">
                and role_name=#{name}
            </if>
        <!--            <if test="streetName != null and streetName != ''">-->
        <!--                AND street_name like concat('%', #{streetName}, '%')-->
        <!--            </if>-->
@@ -45,7 +45,7 @@
        <!--                AND role_id=#{roleId}-->
        <!--            </if>-->
        <!--        </where>-->
        </where>
        order by create_time desc
    </select>
@@ -89,6 +89,11 @@
    <select id="countNum" resultType="integer">
        select count(id) from automessage_role_management
        <where>
            <if test="name!=null and name!=''">
                and role_name=#{name}
            </if>
        </where>
    </select>
</mapper>
flower_city/src/main/resources/mapper/RoleMenuMapper.xml
@@ -29,6 +29,7 @@
                and role_id=#{roleId}
            </if>
        </where>
    </select>