Merge remote-tracking branch 'origin/master'

lin

2024-03-23 b3a0e5051c2923b5e12b059b6634aa9bd12db59b

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java

@@ -42,7 +42,7 @@
@RestController
@RequestMapping(AppConstant.APPLICATION_FLOW_NAME + "/follow")
@AllArgsConstructor
@PreAuth("hasAnyRole('administrator', 'admin','jdgly','sqgly')")
//@PreAuth("hasAnyRole('administrator', 'admin','jdgly','sqgly')")
@ApiIgnore
public class FlowFollowController {


 src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java

@@ -51,7 +51,7 @@
@RequestMapping(AppConstant.APPLICATION_FLOW_NAME + "/manager")
@AllArgsConstructor
@Api(value = "流程管理接口", tags = "流程管理接口")
@PreAuth("hasAnyRole('administrator', 'admin','jdgly','sqgly')")
//@PreAuth("hasAnyRole('administrator', 'admin','jdgly','sqgly')")
@ApiIgnore
public class FlowManagerController {


 src/main/java/org/springblade/flow/engine/controller/FlowModelController.java

@@ -47,7 +47,7 @@
@RestController
@RequestMapping(AppConstant.APPLICATION_FLOW_NAME + "/model")
@AllArgsConstructor
@PreAuth("hasAnyRole('administrator', 'admin','jdgly','sqgly')")
//@PreAuth("hasAnyRole('administrator', 'admin','jdgly','sqgly')")
@ApiIgnore
public class FlowModelController {


 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -740,8 +740,8 @@
        houseParam.setUserId(userId);
        if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
            if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
                // 查询对应的房屋地址code
                stringList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
                // 查询对应社区编号集合
                stringList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId());
            }
        }
        return stringList;

 src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -165,7 +165,7 @@
     * 新增或修改
     */
    @PostMapping("/submit")
    @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
//    @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入menu")
    public R submit(@Valid @RequestBody MenuDTO menu) {

 src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.java

@@ -42,6 +42,7 @@
    List<ECallEventVO> selectECallEventPage(IPage page,
                                            @Param("eCallEvent") ECallEventVO eCallEvent,
                                            @Param("regionChildCodesList") List<String> regionChildCodesList,
                                            @Param("gridCodeList") List<String> gridCodeList,
                                            @Param("isAdministrator") Integer isAdministrator);



 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml

@@ -466,7 +466,7 @@
    <!--取保候审人员查询-->
    <select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
        SELECT
        IFNULL( jda.address_name, jp.location ) AS address_name,
        IFNULL( jda.address_name, jh.house_name ) AS address_name,
        jtbre.apply_name,
        jh.district_code aoiCode,
        jda.region_code,
@@ -522,7 +522,7 @@
            </if>

            <if test="task.aoiCode != null and task.aoiCode != null">
                and jgr.district_code = #{task.aoiCode}
                and jh.district_code = #{task.aoiCode}
            </if>

            <if test="task.neiCode != null and task.neiCode != null">

 src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
@@ -43,9 +44,12 @@

    @Override
    public IPage<ECallEventVO> selectECallEventPage(IPage<ECallEventVO> page, ECallEventVO eCallEvent) {
        List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
        Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
        return page.setRecords(baseMapper.selectECallEventPage(page, eCallEvent,regionChildCodesList,isAdministrator));
        CommonParamSet invoke = new CommonParamSet<>().invoke(ECallEventVO.class, eCallEvent);
        return page.setRecords(baseMapper.selectECallEventPage(page,
            eCallEvent,
            invoke.getRegionChildCodesList(),
            invoke.getGridCodeList(),
            invoke.getIsAdministrator()));
    }

    /**

 src/main/java/org/springblade/modules/task/vo/ECallEventVO.java

@@ -42,4 +42,9 @@
     */
    private String communityName;

    /**
     * 角色名称
     */
    private String roleName;

}