Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -367,6 +367,9 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         }
         //更新维修单信息
         StudentRepair repairInfo = getRepairInfo(Integer.parseInt(studentPaymentOrder.getMusicGroupId()));
+        if(repairInfo == null){
+            throw new BizException("维修单不存在");
+        }
 
         Integer userId = studentPaymentOrder.getUserId();
 

mec-web/src/main/java/com/ym/mec/web/controller/SysUserCashAccountDetailController.java

@@ -1,15 +1,10 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dto.CashAccountDetail;
-import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
+import java.math.BigDecimal;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,7 +12,13 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dto.CashAccountDetail;
+import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
+import com.ym.mec.biz.service.SysUserCashAccountDetailService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.PageInfo;
 
 @RequestMapping("userCashAccountDetail")
 @Api(tags = "用户交易明细服务")
@@ -42,11 +43,6 @@ public class SysUserCashAccountDetailController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('userCashAccountDetail/queryPage')")
     public Object queryPage(CashAccountDetail queryInfo) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || user.getId() != null) {
-            return failed("请重新登录");
-        }
-        queryInfo.setUserId(user.getId());
         PageInfo<SysUserCashAccountDetail> sysUserCashAccountDetailPageInfo = sysUserCashAccountDetailService.queryPage(queryInfo);
 
         int openHideMode = Integer.parseInt(sysConfigDao.findConfigValue("open_hide_mode"));