|
@@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* 申请垫款表
|
|
@@ -51,15 +53,25 @@ public class FinancePaymentApplicationController {
|
|
|
//查询用户角色
|
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(application.getUserId());
|
|
|
if ("sale".equals(roleCode) || "saleAssistant".equals(roleCode) || "saleAm".equals(roleCode)) {
|
|
|
- if (!Check.isNull(application.getApplicanterId())) {
|
|
|
- queryWrapper.eq("applicanter_id", application.getApplicanterId());
|
|
|
+ if ("4f6454dbad954a8094013bf4c6d74796".equals(application.getUserId())) {
|
|
|
+ /*销售助理 曹媛:侯加鑫、王维新、高洪哲 */
|
|
|
+ List<String> userIds = new ArrayList<>();
|
|
|
+ userIds.add("4f6454dbad954a8094013bf4c6d74796");
|
|
|
+ userIds.add("42e137a90ca94cbfa89b21b306cb2e78");//侯加鑫
|
|
|
+ userIds.add("959842590bfc4ad38e0aced255177ced");//王维新
|
|
|
+ userIds.add("f0190eaabfb4488caa22e123e94dadc8");//高洪哲
|
|
|
+ queryWrapper.in("applicanter_id", userIds);
|
|
|
+
|
|
|
+ } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(application.getUserId())) {
|
|
|
+ /*销售助理 陈心瑞:崔泽、王明雨 */
|
|
|
+ List<String> userIds = new ArrayList<>();
|
|
|
+ userIds.add("163a4cc9a72c425e873d36d08e75f2cd");
|
|
|
+ userIds.add("fe4965692844468798e4fc265e3cdfc8");//崔泽
|
|
|
+ userIds.add("9a99a2e906b64f5082f87c3a60a20b2e");//王明雨
|
|
|
+ queryWrapper.in("applicanter_id", userIds);
|
|
|
} else {
|
|
|
queryWrapper.eq("applicanter_id", application.getUserId());
|
|
|
}
|
|
|
- } else {
|
|
|
- if (!Check.isNull(application.getApplicanterId())) {
|
|
|
- queryWrapper.eq("applicanter_id", application.getApplicanterId());
|
|
|
- }
|
|
|
}
|
|
|
if (!Check.isNull(application.getAdvertiserName())) {
|
|
|
queryWrapper.like("advertiser_name", application.getAdvertiserName());
|