检查，指令修改

Administrator

2021-12-02 6b052be0122ab8df9a48752ab2adfa1b35a48ea9

检查，指令修改

 src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java

@@ -66,7 +66,7 @@
     */
    @ApiModelProperty(value = "检查日期")
    @TableField("reviewTime")
    private String reviewtime;
    private Date reviewtime;
    /**
     * 检查内容
     */

 src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml

@@ -16,7 +16,7 @@


    <select id="selectCoinspectPage" resultMap="coinspectResultMap">
        select * from sys_coinspect where is_deleted = 0
        select * from sys_coinspect
    </select>

</mapper>

 src/main/java/org/springblade/modules/directive/controller/DirectiveController.java

@@ -87,7 +87,7 @@
                    DirectiveFile directiveFile = new DirectiveFile();
                    directiveFile.setType(1);
                    directiveFile.setDirectiveId(directive.getId());
                    directiveFile.setUrl(urls);
                    directiveFile.setUrl(url);
                    status = directiveService.saveDirectiveFile(directiveFile);
                    String s2 =
                        "insert into sys_directive_file(id,type,directive_id,url) " +

 src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java

@@ -425,7 +425,7 @@

        List<MultipartFile> fileList = new ArrayList<>();
        //获取图片文件
        fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
        fileList = fileUtil.getSubFiles(desPath,fileList);
        for (MultipartFile multipartFile : fileList){
            if(multipartFile.getName().toLowerCase().endsWith(".png") || multipartFile.getName().toLowerCase().endsWith(".jpg")) {
                String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));

 src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml

@@ -23,8 +23,8 @@

    <select id="selectSocialPage" resultMap="socialResultMap">
        SELECT
        distinct u.id sid,
        s.*,
        distinct u.id,
        u.real_name as realname
        FROM
        blade_user u

 src/main/java/org/springblade/modules/social/vo/SocialVO.java

@@ -34,4 +34,6 @@
    private static final long serialVersionUID = 1L;
    private String realname;

    private Long sid;

}

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

@@ -119,7 +119,10 @@
        <if test="user.cardid!=null and user.cardid != ''">
            and bu.cardid like concat('%', #{user.cardid},'%')
        </if>
        <if test="user.examinationType!=null and user.examinationType != ''">
        <if test="user.examinationType==0">
            and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
        </if>
        <if test="user.examinationType==1">
            and bu.examination_type = #{user.examinationType}
        </if>
        ORDER BY bu.id
@@ -195,6 +198,8 @@
        SELECT id, name, real_name RealName
        FROM blade_user
        where cardid = #{param1}
        and is_deleted = 0
        and status = 1
    </select>