purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化解决接口中仓库排序的bug

Browse Source
This commit is contained in:
季圣华
2021-12-13 23:51:23 +08:00
parent da275197a5
commit fdfd69c202
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
View File

@@ -231,7 +231,7 @@ public class DepotService {
public List<Depot> findUserDepot()throws Exception{ public List<Depot> findUserDepot()throws Exception{
DepotExample example = new DepotExample(); DepotExample example = new DepotExample();
example.createCriteria().andTypeEqualTo(0).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andTypeEqualTo(0).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Sort"); example.setOrderByClause("sort");
List<Depot> list=null; List<Depot> list=null;
try{ try{
list= depotMapper.selectByExample(example); list= depotMapper.selectByExample(example);
@@ -241,19 +241,6 @@ public class DepotService {
return list; return list;
} }
public List<Depot> findGiftByType(Integer type)throws Exception{
DepotExample example = new DepotExample();
example.createCriteria().andTypeEqualTo(type);
example.setOrderByClause("Sort");
List<Depot> list=null;
try{
list= depotMapper.selectByExample(example);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateIsDefault(Long depotId) throws Exception{ public int updateIsDefault(Long depotId) throws Exception{
int result=0; int result=0;
@@ -309,16 +296,16 @@ public class DepotService {
if(StringUtil.isNotEmpty(depotStr)){ if(StringUtil.isNotEmpty(depotStr)){
depotStr = depotStr.replaceAll("\\[", "").replaceAll("]", ","); depotStr = depotStr.replaceAll("\\[", "").replaceAll("]", ",");
String[] depotArr = depotStr.split(","); String[] depotArr = depotStr.split(",");
for(String depotId: depotArr) { for (Depot depot : dataList) {
JSONObject item = new JSONObject(); for(String depotId: depotArr) {
item.put("id", Long.parseLong(depotId));
for (Depot depot : dataList) {
if(depot.getId() == Long.parseLong(depotId)){ if(depot.getId() == Long.parseLong(depotId)){
JSONObject item = new JSONObject();
item.put("id", depot.getId());
item.put("depotName", depot.getName()); item.put("depotName", depot.getName());
item.put("isDefault", depot.getIsDefault()); item.put("isDefault", depot.getIsDefault());
arr.add(item);
} }
} }
arr.add(item);
} }
} }
} }