kangwei：废气管理，取消权限控制，使用系统自带权限

@@ -74,7 +74,9 @@ public class AjhWasteGasController {
 		QueryWrapper<AjhWasteGas> queryWrapper = QueryGenerator.initQueryWrapper(ajhWasteGas, req.getParameterMap());
 		QueryWrapper<AjhWasteGas> queryWrapper = QueryGenerator.initQueryWrapper(ajhWasteGas, req.getParameterMap());
 		Page<AjhWasteGas> page = new Page<AjhWasteGas>(pageNo, pageSize);
 		Page<AjhWasteGas> page = new Page<AjhWasteGas>(pageNo, pageSize);
 
 
-		queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
+		if(StringUtils.isNotEmpty(departIds)){
+			queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
+		}
 		IPage<AjhWasteGas> pageList = ajhWasteGasService.page(page, queryWrapper);
 		IPage<AjhWasteGas> pageList = ajhWasteGasService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);

@@ -211,6 +211,7 @@ public class ErpSettlementController {
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		erpSettlementEntity.setInspectTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setInspectTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
+		erpSettlementEntity.setAuditStatus(2);
 		erpSettlementEntity.setInspectorSign(BaseContextHandler.getUserName());
 		erpSettlementEntity.setInspectorSign(BaseContextHandler.getUserName());
 		if(erpSettlementEntity==null) {
 		if(erpSettlementEntity==null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
@@ -231,6 +232,7 @@ public class ErpSettlementController {
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		erpSettlementEntity.setApproveTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setApproveTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setApproverSign(BaseContextHandler.getUserName());
 		erpSettlementEntity.setApproverSign(BaseContextHandler.getUserName());
+		erpSettlementEntity.setAuditStatus(3);
 		if(erpSettlementEntity==null) {
 		if(erpSettlementEntity==null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {