|
@@ -85,8 +85,9 @@ public class KuaishouLiveUserAccountServiceImpl implements IKuaishouLiveUserAcco
|
|
|
} else {
|
|
|
List<String> accountNames = kuaishouLiveUserAccountMapper.queryAccountNamesByUserId(kuaishouLiveUserAccount.getUserId());
|
|
|
if (Check.isNotNull(accountNames) && accountNames.size() > 0) {
|
|
|
+ kuaishouLiveUserAccount.setAccountNames(accountNames);
|
|
|
PageUtils.startPage();
|
|
|
- list = kuaishouLiveUserAccountMapper.selectAllListByAccountNames(accountNames, kuaishouLiveUserAccount);
|
|
|
+ list = kuaishouLiveUserAccountMapper.selectAllListByAccountNames(kuaishouLiveUserAccount);
|
|
|
}
|
|
|
}
|
|
|
return list;
|
|
@@ -102,8 +103,9 @@ public class KuaishouLiveUserAccountServiceImpl implements IKuaishouLiveUserAcco
|
|
|
} else {
|
|
|
List<String> accountNames = kuaishouLiveUserAccountMapper.queryAccountNamesByUserId(userAccount.getUserId());
|
|
|
if (Check.isNotNull(accountNames) && accountNames.size() > 0) {
|
|
|
+ userAccount.setAccountNames(accountNames);
|
|
|
PageUtils.startPage();
|
|
|
- list = kuaishouLiveUserAccountMapper.queryAllListByAccountNames(accountNames, userAccount.getAccountName(), userAccount.getKsName());
|
|
|
+ list = kuaishouLiveUserAccountMapper.queryAllListByAccountNames(userAccount);
|
|
|
}
|
|
|
}
|
|
|
return list;
|
|
@@ -136,7 +138,7 @@ public class KuaishouLiveUserAccountServiceImpl implements IKuaishouLiveUserAcco
|
|
|
}
|
|
|
account.setId(UUID.randomUUID().toString().replace("-", ""));
|
|
|
account.setProjectId(getAndInsertProject(account.getKsId(), account.getKsName()));
|
|
|
- account.setAccountStatus("正常");
|
|
|
+ account.setAccountStatus("审核通过");
|
|
|
int num = kuaishouLiveUserAccountMapper.insertKuaishouLiveUserAccount(account);
|
|
|
if (num > 0) {
|
|
|
return ResultResponse.success();
|
|
@@ -156,13 +158,13 @@ public class KuaishouLiveUserAccountServiceImpl implements IKuaishouLiveUserAcco
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public ResultResponse insertByExcel(MultipartFile file,Long createrId) {
|
|
|
+ public ResultResponse insertByExcel(MultipartFile file, Long createrId) {
|
|
|
List<KuaishouLiveUserAccount> accountList = new ArrayList<>();
|
|
|
try {
|
|
|
String fileName = file.getOriginalFilename();
|
|
|
List<JSONObject> list = LiveDataExcelUtils.analysisFile(file, fileName);
|
|
|
for (JSONObject object : list) {
|
|
|
- KuaishouLiveUserAccount account = new KuaishouLiveUserAccount(object,createrId);
|
|
|
+ KuaishouLiveUserAccount account = new KuaishouLiveUserAccount(object, createrId);
|
|
|
account.setOperatorLeaderId(getUserIdByName(account.getOperatorLeader()));
|
|
|
account.setSaleLeaderId(getUserIdByName(account.getSaleLeader()));
|
|
|
account.setProjectId(getAndInsertProject(account.getKsId(), account.getProjectName()));
|