合同管理校验

linwei

2024-01-22 4326a193131dba3514241ee64401ed3f4a2f427d

合同管理校验

 src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java

@@ -82,12 +82,12 @@
     */
    @Override
    public Object getDistrictTree(DistrictVO district) {
        // String userRole = AuthUtil.getUserRole();
        // if (userRole.equals("wygly")) {
        //     IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
        //     List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
        //     district.setDistrictIdList(strings);
        // }
         String userRole = AuthUtil.getUserRole();
         if (userRole.equals("wygly")||userRole.equals("wyxmjl")) {
             // 查询管理的小区  不好过滤小区
            // todo
            // district.setDistrictIdList(strings);
         }
        Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
        List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);
        stringNodeTree.forEach(node -> recursion(node));

 src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java

@@ -118,7 +118,7 @@
     * @return
     */
    @PostMapping("/saveOrUpdate")
    public R saveOrUpdate(@Valid @RequestBody PropertyCompanyDistrictEntity propertyCompanyDistrict) {
    public R saveOrUpdate(@Valid @RequestBody PropertyCompanyDistrictEntity propertyCompanyDistrict) throws Exception {
        return R.status(propertyCompanyDistrictService.saveOrUpdatePropertyCompanyDistrict(propertyCompanyDistrict));
    }


 src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java

@@ -48,7 +48,7 @@
     * @param propertyCompanyDistrict
     * @return
     */
    boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict);
    boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) throws Exception;

    List<UserEntity> getDistictUserByCode(String houseCode);
}

 src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java

@@ -55,7 +55,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) {
    public boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) throws Exception {
        IUserService bean = SpringUtil.getBean(IUserService.class);
        User user = bean.getOne(Wrappers.<User>lambdaQuery().eq(User::getId, propertyCompanyDistrict.getPrincipal()));
        if (StringUtils.isNotBlank(user.getRoleId())) {
@@ -69,6 +69,13 @@
            bean.updateById(user);
            return updateById(propertyCompanyDistrict) && submitPropertyDistrictUser(propertyCompanyDistrict);
        } else {
            long count = count(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
                .eq(PropertyCompanyDistrictEntity::getDistrictId, propertyCompanyDistrict.getDistrictId())
                .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, propertyCompanyDistrict.getPropertyCompanyId())
                .eq(PropertyCompanyDistrictEntity::getIsDeleted, 0));
            if (count > 0) {
                throw new Exception("您已有该小区的合同，请勿重复添加！");
            }
            bean.updateById(user);
            return save(propertyCompanyDistrict) && submitPropertyDistrictUser(propertyCompanyDistrict);
        }