用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据

guoshilong

2022-10-24 62084735c1f5d6b6d4771aadf4d9241479a4d4ee

用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据

 src/main/java/org/springblade/common/config/BladeConfiguration.java

@@ -58,7 +58,7 @@
        secureRegistry.excludePathPatterns("/farmPlant/**");
        secureRegistry.excludePathPatterns("/task/task/**");
        secureRegistry.excludePathPatterns("/recovery/**");
//        secureRegistry.excludePathPatterns("/farm/**");
        secureRegistry.excludePathPatterns("/farm/**");
        secureRegistry.excludePathPatterns("/sale/sale/**");
        secureRegistry.excludePathPatterns("/farmingRecord/**");
//        secureRegistry.excludePathPatterns("/blade-user/**");

 src/main/java/org/springblade/modules/panorama/mapper/PanoramaMapper.xml

@@ -30,7 +30,7 @@
    </select>

    <select id="getFarmList" resultType="org.springblade.modules.panorama.entity.Panorama">
        select * from sys_panorama where farm_id = #{farmId}
        select * from sys_panorama where farm_id = #{farmId} AND is_deleted = 0
    </select>

</mapper>

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -152,7 +152,7 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入User")
    public R update(@Valid @RequestBody User user) {
        CacheUtil.clear(USER_CACHE);
//        CacheUtil.clear(USER_CACHE);
        return R.status(userService.updateUser(user));
    }


 src/main/java/org/springblade/modules/system/entity/User.java

@@ -16,6 +16,8 @@
 */
package org.springblade.modules.system.entity;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -74,10 +76,12 @@
    /**
     * 生日
     */
    @TableField(value = "birthday",updateStrategy = FieldStrategy.IGNORED)
    private Date birthday;
    /**
     * 性别
     */
    @TableField(value = "sex",updateStrategy = FieldStrategy.IGNORED)
    private Integer sex;
    /**
     * 角色id

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -36,10 +36,10 @@
            and tenant_id = #{user.tenantId}
        </if>
        <if test="user.account!=null and user.account != ''">
            and account = #{user.account}
            and account LIKE CONCAT('%',#{user.account},'%')
        </if>
        <if test="user.realName!=null and user.realName != ''">
            and real_name = #{user.realName}
            and real_name LIKE CONCAT('%',#{user.realName},'%')
        </if>
        <if test="user.userType!=null and user.userType != ''">
            and user_type = #{user.userType}