Kaynağa Gözat

[标签短信][修改]查询问题

release_toaliyun_real
gongbiao 7 yıl önce
ebeveyn
işleme
612c4116af
9 değiştirilmiş dosya ile 13 ekleme ve 11 silme
  1. +2
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java
  2. +1
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java
  3. +3
    -1
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java
  4. +1
    -2
      mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java
  5. +2
    -4
      mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml
  7. +1
    -1
      mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml
  8. +1
    -1
      mallinkService/src/main/resources/mapper/WxMsgMapper.xml
  9. +1
    -1
      mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml

+ 2
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java Dosyayı Görüntüle

@@ -30,6 +30,7 @@ public class WxMsgCallbackController extends BaseController
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback,Integer pageNum, Integer pageSize) {
if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback();
wxMsgCallback.setTenantId(getTenantId());
final PageInfo<WxMsgCallback> page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize);
return new ResultData(page);
}
@@ -39,6 +40,7 @@ public class WxMsgCallbackController extends BaseController
public ResultData add(@RequestBody WxMsgCallback wxMsgCallback) {
//Assert.notNull(wxMsgCallback.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMsgCallback.setTenantId(getTenantId());
wxMsgCallbackService.saveOrUpdate(wxMsgCallback);
return new ResultData();
}


+ 1
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java Dosyayı Görüntüle

@@ -35,6 +35,7 @@ public class WxMsgController extends BaseController
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMsg wxMsg,Integer pageNum, Integer pageSize) {
if (null == wxMsg) wxMsg = new WxMsg();
wxMsg.setTenantId(getTenantId());
final PageInfo<WxMsg> page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize);
return new ResultData(page);
}


+ 3
- 1
mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java Dosyayı Görüntüle

@@ -28,6 +28,7 @@ public class WxMsgSignatureController extends BaseController
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature,Integer pageNum, Integer pageSize) {
if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature();
wxMsgSignature.setTenantId(getTenantId());
final PageInfo<WxMsgSignature> page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize);
return new ResultData(page);
}
@@ -37,6 +38,7 @@ public class WxMsgSignatureController extends BaseController
public ResultData add(@RequestBody WxMsgSignature wxMsgSignature) {
//Assert.notNull(wxMsgSignature.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMsgSignature.setTenantId(getTenantId());
wxMsgSignatureService.saveOrUpdate(wxMsgSignature);
return new ResultData();
}
@@ -66,7 +68,7 @@ public class WxMsgSignatureController extends BaseController
@ApiOperation("获取所有数据")
@GetMapping("getsignaturelist")
public ResultData getmodellist() {
return wxMsgSignatureService.getsignaturelist();
return wxMsgSignatureService.getsignaturelist(getTenantId());
}


+ 1
- 2
mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java Dosyayı Görüntüle

@@ -1,6 +1,5 @@
package com.simple.service;

import java.util.*;
import com.github.pagehelper.PageInfo;
import com.simple.common.ResultData;
import com.simple.domain.po.WxMsgSignature;
@@ -40,6 +39,6 @@ public interface WxMsgSignatureService {
void deleteById(Long id);


ResultData getsignaturelist();
ResultData getsignaturelist(String tenantId);

}

+ 2
- 4
mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java Dosyayı Görüntüle

@@ -4,7 +4,6 @@ import java.util.*;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.simple.common.ResultData;
import com.simple.domain.po.WxMsgModel;
import com.simple.domain.po.WxMsgSignature;
import com.simple.mapper.WxMsgSignatureMapper;
import com.simple.service.WxMsgSignatureService;
@@ -35,7 +34,6 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService {
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setTenantId("1");
record.setCreatetime(new Date());
wxMsgSignatureMapper.insertSelective(record);
} else {
@@ -49,9 +47,9 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService {
}

@Override
public ResultData getsignaturelist() {
public ResultData getsignaturelist(String tenantId) {
WxMsgSignature wxMsgSignature = new WxMsgSignature();
wxMsgSignature.setTenantId("1");
wxMsgSignature.setTenantId(tenantId);
List<WxMsgSignature> list = wxMsgSignatureMapper.findList(wxMsgSignature);
return new ResultData(list);
}


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml Dosyayı Görüntüle

@@ -27,7 +27,7 @@
</if>
<if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')
and `tenant_id` = #{tenantId}
</if>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml Dosyayı Görüntüle

@@ -35,7 +35,7 @@
</if>
<if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')
and `tenant_id` = #{tenantId}
</if>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMsgMapper.xml Dosyayı Görüntüle

@@ -36,7 +36,7 @@
</if>
<if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')
and `tenant_id` = #{tenantId}
</if>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml Dosyayı Görüntüle

@@ -21,7 +21,7 @@
</if>
<if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')
and `tenant_id` = #{tenantId}
</if>


Yükleniyor…
İptal
Kaydet