枪支修改

Administrator

2021-12-02 cc894ffd65ef7ecadf58065f74b873507fd6e55c

枪支修改

 src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java

@@ -117,6 +117,15 @@
                            locationVo.setLongitude(gunLiveLocationVO.getDwjd().toString());
                            locationVo.setLatitude(gunLiveLocationVO.getDwwd().toString());
                            locationVo.setCompany(gunLiveLocationVO.getSzdw());
                            if (null!=gun.getIssueUnit() && !gun.getIssueUnit().equals("")){
                                locationVo.setIssueUnit(gun.getIssueUnit());
                            }
                            if (null!=gun.getIssueTime() && !gun.getIssueTime().equals("")){
                                locationVo.setIssueTime(gun.getIssueTime());
                            }
                            if (null!=gun.getValidTime() && !gun.getValidTime().equals("")){
                                locationVo.setValidTime(gun.getValidTime());
                            }
                            //存入集合
                            list.add(locationVo);
                        }

 src/main/java/org/springblade/modules/location/vo/LiveLocationVo.java

@@ -4,6 +4,7 @@
import org.springblade.modules.location.entity.LiveLocation;

import java.io.Serializable;
import java.util.Date;

/**
 * @author zhongrj
@@ -74,4 +75,21 @@
     */
    private String gunNum;

    /**
     * 发证单位名称
     */
    private String issueUnit;

    /**
     * 发证日期
     */
    private Date issueTime;

    /**
     * 发证有效期
     */
    private Date validTime;



}

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

@@ -225,9 +225,6 @@
        br.role_alias = "安保人员"
        and
        bu.status = 1
        and bd.parent_id!=1425365577303621633
        and bd.id != 1425365577303621633
        and bd.id != 1432625856013971457
        <if test="user.deptId!=null and user.deptId!=''">
            and bd.id in
            (