|
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -64,9 +65,13 @@ public class XcryServiceImpl extends ServiceImpl<XcryMapper, Bjxcry> implements
|
|
|
|
|
|
@Override
|
|
|
public List<BjXcryDkRespVO> getXcryDkList(String xcryId, String dkbh) {
|
|
|
- List<String> dkIds = xcryMapper.getDkIds(xcryId);
|
|
|
- if(CollectionUtil.isEmpty(dkIds)){
|
|
|
- return null;
|
|
|
+ Bjxcry bjxcry = xcryMapper.selectById(xcryId);
|
|
|
+ List<String> dkIds = new ArrayList<>();
|
|
|
+ if(StringUtils.isNotBlank(bjxcry.getGddw())){
|
|
|
+ dkIds = xcryMapper.getDkIds(xcryId);
|
|
|
+ if(CollectionUtil.isEmpty(dkIds)){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|
|
|
return xcryMapper.getXcryDk(dkIds,dkbh);
|
|
|
}
|
|
@@ -100,6 +105,11 @@ public class XcryServiceImpl extends ServiceImpl<XcryMapper, Bjxcry> implements
|
|
|
return phoneNumber;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<Map> listByAdmin() {
|
|
|
+ return xcryMapper.listByAdmin();
|
|
|
+ }
|
|
|
+
|
|
|
private String getWxAccessToken() throws Exception {
|
|
|
String ACCESS_TOKEN_API = "https://api.weixin.qq.com/cgi-bin/token";
|
|
|
String wx_appid = "wxf515059e19e3d655";
|