Merge remote-tracking branch 'origin/master'

石广澎

2023-12-12 45bfb77d4b4d1b1d3204475caba9b9c0e3e04ef9

 consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java

@@ -11,6 +11,7 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import org.apache.commons.compress.utils.Lists;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +28,7 @@
 * @Description
 * @Version 1.0
 **/
@Api(value = "仓库流水", tags = "仓库流水")
@RestController
@RequestMapping("/pc/warehouse/flow")
public class LWarehouseFlowController extends BaseController {
@@ -79,7 +81,7 @@
    }

    @GetMapping("/getTaiZhangList")
    public ResponseValue getTaiZhangList( ) {
    public ResponseValue getTaiZhangList() {
        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
@@ -99,4 +101,30 @@
        return ResponseValue.success(genericPager);
    }

    /**
     * 部门台账
     *
     * @return
     */
    @GetMapping("/getDeptTaiZhangList")
    public ResponseValue getDeptTaiZhangList() {
        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
        LWarehouseFlowParam param2 = new LWarehouseFlowParam();
        CommonUtil.copyProperties(param, param2);
        param = param2;
        /*当前登录人只能看到自己机构下的列表*/
        FinSysTenantUser sysInfo = this.getSysInfo();
        String tenantId = sysInfo.getTenantId();
        Long paramAgencyId = param.getAgencyId();
        if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
            param.setAgencyId(Long.valueOf(tenantId));
        }
        GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryDeptTaiZhangList(param);
        return ResponseValue.success(genericPager);
    }

}