update

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/CostLogServiceImpl.java

@@ -3,10 +3,10 @@ package com.blt.other.module.cost.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.module.auth.dao.CostReviewerMapper;
+import com.blt.other.module.auth.dao.OaUserMapper;
 import com.blt.other.module.auth.dao.UserDao;
 import com.blt.other.module.auth.model.CostReviewer;
 import com.blt.other.module.auth.model.OaUser;
-import com.blt.other.module.auth.service.IOaUserService;
 import com.blt.other.module.cost.dao.CostCompanyDao;
 import com.blt.other.module.cost.dao.CostDao;
 import com.blt.other.module.cost.dao.CostLogDao;
@@ -58,7 +58,7 @@ public class CostLogServiceImpl implements CostLogService {
     }
 
     @Resource
-    IOaUserService oaUserService;
+    OaUserMapper oaUserMapper;
     @Resource
     CostDao costDao;
     @Resource
@@ -74,32 +74,35 @@ public class CostLogServiceImpl implements CostLogService {
 
         CostDomain costDomain = costDao.selectByCostNo(costNo);
 
-        OaUser oaUser = oaUserService.selectManage(costDomain.getCreateUserid());
+        OaUser costUser = oaUserMapper.selectByOaUserId(costDomain.getCreateUserid());
         CostCompanyDomain costCompany = costCompanyDao.selectByNo(costDomain.getCompanyNo());
         OaUser reviewer;
         if (type.equals(CostLogDomain.DEPARTMENT_AUTO_PASS)) {
             reviewer = costReviewerMapper.selectList(new LambdaQueryWrapper<CostReviewer>()
                     .eq(CostReviewer::getType, CostReviewer.departmentReviewer)
-                    .eq(CostReviewer::getReferId, oaUser.getPrimaryDepartmentId()))
+                    .eq(CostReviewer::getReferId, costUser.getPrimaryDepartmentId()))
                     .stream()
+                    .limit(1)
                     .findAny()
-                    .map(costReviewer -> oaUserService.selectManage(costReviewer.getReviewerUserId()))
+                    .map(costReviewer -> oaUserMapper.selectByOaUserId(costReviewer.getReviewerUserId()))
                     .orElse(OaUser.DEFAULT);
         } else if (type.equals(CostLogDomain.FINANCIAL_AUTO_PASS)) {
             reviewer = costReviewerMapper.selectList(new LambdaQueryWrapper<CostReviewer>()
                     .eq(CostReviewer::getType, CostReviewer.financialReviewer)
                     .eq(CostReviewer::getReferId, costCompany.getId()))
                     .stream()
+                    .limit(1)
                     .findAny()
-                    .map(costReviewer -> oaUserService.selectManage(costReviewer.getReviewerUserId()))
+                    .map(costReviewer -> oaUserMapper.selectByOaUserId(costReviewer.getReviewerUserId()))
                     .orElse(OaUser.DEFAULT);
         } else if (type.equals(CostLogDomain.FINAL_AUTO_PASS)) {
             reviewer = costReviewerMapper.selectList(new LambdaQueryWrapper<CostReviewer>()
                     .eq(CostReviewer::getType, CostReviewer.finalReviewer)
                     .eq(CostReviewer::getReferId, costCompany.getId()))
                     .stream()
+                    .limit(1)
                     .findAny()
-                    .map(costReviewer -> oaUserService.selectManage(costReviewer.getReviewerUserId()))
+                    .map(costReviewer -> oaUserMapper.selectByOaUserId(costReviewer.getReviewerUserId()))
                     .orElse(OaUser.DEFAULT);
         } else {
             throw new BizRuntimeException("invalid param");
@@ -110,7 +113,7 @@ public class CostLogServiceImpl implements CostLogService {
         costLog.setUpdateUserid(reviewer.getOaUserId());
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        costLog.setUpdateNote(sdf.format(costLog.getUpdateTime()) + "  " + updateMainNote + "  更新人：" + oaUser.getUserName());
+        costLog.setUpdateNote(sdf.format(costLog.getUpdateTime()) + "  " + updateMainNote + "  更新人：" + reviewer.getUserName());
         costLog.setType(type);
         return costLogDao.insert(costLog);
     }

bailuntec-cost-core/src/main/resources/mapper/Cost.xml

@@ -445,6 +445,7 @@
             </if>
             and (t7.reviewer_user_id = #{userid} )
         </if>
+        order by t1.create_time desc
         group by
         t1.id
     </select>