智慧保安后台管理-验收版本
tangzy
2021-07-15 25da56c1fd66728db816a602fa0b719d1a6fca97
1.保安员证编码
3 files modified
7 ■■■■ changed files
src/main/java/org/springblade/modules/punish/entity/Punish.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/entity/User.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/punish/entity/Punish.java
@@ -50,7 +50,7 @@
     * 单位id
     */
    @ApiModelProperty(value = "单位id")
    private Integer deptid;
    private String deptid;
    /**
     * 处罚类别 0:警告 1:罚款  2:没收违法所得、没收非法财物 3: 责令停业 4:暂扣或者吊销许可证
     */
src/main/java/org/springblade/modules/system/entity/User.java
@@ -149,6 +149,7 @@
    private String rtime;
    private String hold;
    private String jurisdiction;
    private String securitynumber;
}
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -38,6 +38,7 @@
        <result column="rtime" property="rtime"/>
        <result column="hold" property="hold"/>
        <result column="jurisdiction" property="jurisdiction"/>
        <result column="securitynumber" property="securitynumber"/>
    </resultMap>
    <select id="selectUserPage" resultMap="userResultMap">
@@ -68,6 +69,9 @@
        </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
            and jurisdiction = #{user.jurisdiction}
        </if>
        <if test="user.securitynumber!=null and user.securitynumber != ''">
            and securitynumber = #{user.securitynumber}
        </if>
        <if test="deptIdList!=null and deptIdList.size>0">
            and id in (
                SELECT