bug修改

zhanghua

2022-11-08 bb8a900d64677347c71a14b3bdf7110e1d7fcef8

bug修改

 ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java

@@ -83,7 +83,7 @@


    @ApiModelProperty(value = "用户类型")
    private Byte userType;
    private Integer userType;

    @ApiModelProperty(value = "座机/分机")
    private String zj;
@@ -99,7 +99,7 @@
    private String keyword;
    @ApiModelProperty(value = "部门")
    @TableField(exist = false)
    private UmsDepart depart;
    private List<UmsDepart> depart;
    @ApiModelProperty(value = "角色列表")
    @TableField(exist = false)
    private List<UmsRole> roles;

 ycl-common/src/main/java/com/ycl/vo/user/UserVO.java

@@ -20,7 +20,7 @@


        @ApiModelProperty(value = "用户类型,0即为查询全部，默认0",example = "0")
        private Byte userType;
        private Integer userType;

        @ApiModelProperty(value = "职务")
        private String jobTitle;

 ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml

@@ -10,6 +10,7 @@
        <result column="icon" property="icon"/>
        <result column="email" property="email"/>
        <result column="nick_name" property="nickName"/>
        <result column="sex" property="sex"/>
        <result column="note" property="note"/>
        <result column="create_time" property="createTime"/>
        <result column="login_time" property="loginTime"/>
@@ -23,7 +24,7 @@
        <result column="mobile" property="mobile"/>
    </resultMap>
    <resultMap type="com.ycl.entity.user.UmsAdmin" id="CondMapResultMap" extends="BaseResultMap">
        <association property="depart" javaType="com.ycl.entity.depart.UmsDepart">
        <collection property="depart" javaType="ArrayList" ofType="com.ycl.entity.depart.UmsDepart">
            <id column="depart_id" property="id"/>
            <result column="depart_name" property="departName"/>
            <result column="depart_des" property="departDes"/>
@@ -33,8 +34,9 @@
            <result column="depart_create_time" property="createTime"/>
            <result column="depart_update_time" property="updateTime"/>
            <result column="is_deleted" property="isDeleted"/>
        </association>
        <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id" select="selectAdminRoles">
        </collection>
        <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id"
                    select="selectAdminRoles">
            <id column="role_id" property="id"/>
            <result column="name" property="name"/>
            <result column="description" property="description"/>

 ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java

@@ -36,7 +36,7 @@
    @ApiModelProperty("照片")
    private String storephoto;

    @NotBlank(message = "身份证信息不能为空")
//    @NotBlank(message = "身份证信息不能为空")
    @ApiModelProperty("身份证信息")
    private String idcardinfo;


 ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml

@@ -28,5 +28,6 @@
                t1.store_name LIKE  CONCAT('%', #{keyword}, '%')
            </if>
        </where>
        order by t1.id desc
    </select>
</mapper>