ci:持续修改

cjl

2023-09-27 57b29a43e4d1505d44e1ac82ed61ef640ba49e8c

ci:持续修改

 screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java

@@ -37,4 +37,10 @@

    @ApiModelProperty(value = "期限天数")
    private Integer changeDay;

    @ApiModelProperty(value = "上报单位id")
    private Integer escalationUnitId;

    @ApiModelProperty(value = "上报人")
    private String escalationName;
}

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -115,11 +115,11 @@
        wrapper.eq("is_del",Constants.NOT_DELETE);
        wrapper.eq("state",0);
        wrapper.eq("is_invalid",0);

        //获取用户信息
        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
        Object code = userInfo.get("code");
        if (!ObjectUtils.isEmpty(code)){
            wrapper.eq("area_code",code);
        List<Integer> unitList = unitResult();
        if (CollectionUtils.isNotEmpty(unitList)){
            wrapper.in("unit_id",unitList);
        }
        List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
        return responsibilityUnits;