智慧保安后台管理-外网-验收版本
tangzy
2021-09-22 bc6ef75155f94e7ac9f31c542b19d658519bfab2
1.辖区
6 files modified
40 ■■■■ changed files
src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/jurisdiction/service/JurisdictionService.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java 20 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
@@ -157,5 +157,15 @@
        return R.status(jurisdictionService.removeDept(ids));
    }
    /**
     * 辖区id
     * @param deptname
     * @return
     */
    @GetMapping("/selJur")
    public R selJur(String deptname) {
        String s = jurisdictionService.selJur(deptname);
        return R.data(s);
    }
}
src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.java
@@ -71,5 +71,5 @@
     * @return
     */
    List<String> getDeptNames(Long[] ids);
    String selJur(String deptname);
}
src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
@@ -113,4 +113,7 @@
            sys_jurisdiction dept
        WHERE dept.is_deleted = 0
    </select>
    <select id="selJur" resultType="java.lang.String">
        SELECT id FROM sys_jurisdiction WHERE dept_name=#{deptname}
    </select>
</mapper>
src/main/java/org/springblade/modules/jurisdiction/service/JurisdictionService.java
@@ -79,4 +79,5 @@
     * @return
     */
    boolean submit(Jurisdiction jurisdiction);
    String selJur(String deptname);
}
src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java
@@ -107,6 +107,10 @@
        return saveOrUpdate(dept);
    }
    @Override
    public String selJur(String deptname) {
        return baseMapper.selJur(deptname);
    }
}
src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -192,16 +192,16 @@
//            }
//        }
        //根据 deptId 查询dept信息,公安管理员
        Dept dept = iDeptService.getById(user.getDeptId());
        Long sid = 1123598813738675201L;
        if (dept.getParentId().equals(sid)){
            //获取辖区的数据
            Jurisdiction jurisdiction = new Jurisdiction();
            jurisdiction.setDeptName(dept.getDeptName());
            Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
            user.setJurisdiction(one.getId().toString());
        }
//        //根据 deptId 查询dept信息,公安管理员
//        Dept dept = iDeptService.getById(user.getDeptId());
//        Long sid = 1123598813738675201L;
//        if (dept.getParentId().equals(sid)){
//            //获取辖区的数据
//            Jurisdiction jurisdiction = new Jurisdiction();
//            jurisdiction.setDeptName(dept.getDeptName());
//            Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
//            user.setJurisdiction(one.getId().toString());
//        }
        userService.submit(user);
        //        String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
        String rtime = null;