Просмотр исходного кода

转领导审批-测试账号修改为正式账号

yangzian 3 лет назад
Родитель
Сommit
6a9f270e5e

+ 3 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -225,8 +225,8 @@ public class CwjsPolicyInfoController {
 				}
 			}
 			cwjsPolicyInfoEntity.setApprovedStatus(2);
-			cwjsPolicyInfoEntity.setApprovedProgress("80e747cdea6f41dbbc8cde23046fd4e0");	//设置 boss 为审核人员
-			JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("80e747cdea6f41dbbc8cde23046fd4e0");
+			cwjsPolicyInfoEntity.setApprovedProgress("4aba62011120ac565c7f2b9f8f4aa96b");	//设置 boss 为审核人员
+			JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("4aba62011120ac565c7f2b9f8f4aa96b");
 			StringBuilder text = new StringBuilder();
 			text.append("您有一条销售政策需要审核,该客户为:");
 			text.append(cwjsPolicyInfoEntity.getCompanyName());
@@ -345,7 +345,7 @@ public class CwjsPolicyInfoController {
 
 			if(cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4){
 				if (cwjsPolicy.getApprovedProgress().equals(approvalUser.getApprovalUserId()) && approvalUser.getApprovalUserId().equals(userId)
-						&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
+						&& !"4aba62011120ac565c7f2b9f8f4aa96b".equals(userId)){
 					cwjsPolicy.setTheBossRight("yes");
 				}
 			}else {

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsSaleAssistantInfoMapper.java

@@ -28,6 +28,8 @@ public interface CwjsSaleAssistantInfoMapper extends BaseMapper<CwjsSaleAssistan
      */
     List <CwjsSaleAssistantInfo> getCwSaleNameList(String userId);
 
+    List <CwjsSaleAssistantInfo> selectCwSaleName(String userId);
+
     /**
      * 查询对应销售助理
      * @param userId

+ 10 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsSaleAssistantInfoMapper.xml

@@ -63,6 +63,16 @@
 
 
     </select>
+<!--查询销售 -->
+    <select id="selectCwSaleName" resultType="org.jeecg.ctop.finance.policy.entity.CwjsSaleAssistantInfo">
+        SELECT
+            u.sale_id AS sale_id,
+            u.sale_name AS sale_name
+        FROM
+            ctop_cwjs_sale_assistant_info u
+            where u.sale_id = #{userId}
+        GROUP BY u.id;
+    </select>
 
 
     <!--查询对应销售助理 -->

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsSaleAssistantInfoServiceImpl.java

@@ -95,7 +95,7 @@ public class CwjsSaleAssistantInfoServiceImpl extends ServiceImpl<CwjsSaleAssist
         //查询 销售
         List <CwjsSaleAssistantInfo> saleList = null;
         //销售
-        saleList = cwjsSaleAssistantInfoMapper.getCwSaleNameList(userId);
+        saleList = cwjsSaleAssistantInfoMapper.selectCwSaleName(userId);
         if (Check.isNull(saleList)){
             //助理
             saleList = cwjsSaleAssistantInfoMapper.getAssistantList(userId);