Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back_end_wechat-104' into release

test
release
Stormeye Wu 7 лет назад
Родитель
Сommit
44598fbed0
2 измененных файлов: 5 добавлений и 3 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java
  2. +3
    -3
      mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java Просмотреть файл

@@ -98,6 +98,8 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService {
WxAppinfo appinfo = appinfoMapper.findByAppId(record.getAuthorizerAppid());
if(appinfo != null) {
record.setId(appinfo.getId());
record.setTenantId(appinfo.getTenantId());
record.setType(appinfo.getType());
} else {
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
final IdWorker idWorker = IdWorker.get();


+ 3
- 3
mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java Просмотреть файл

@@ -844,7 +844,7 @@ public class WxWeappInfoController extends BaseController {
weappCodeStatusVo.setName(null);
}
}
weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.TenantId_ASC, WxWeappCodeStatus.Field.Type_ASC, WxWeappCodeStatus.Field.UserVersion_DESC);
weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.CodeTime_DESC, WxWeappCodeStatus.Field.TenantId_ASC, WxWeappCodeStatus.Field.Type_ASC, WxWeappCodeStatus.Field.UserVersion_DESC);
final PageInfo<WxWeappCodeStatusVo> page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize);
return new ResultData(page);
}
@@ -866,7 +866,7 @@ public class WxWeappInfoController extends BaseController {
weappAuditStatusVo.setName(null);
}
}
weappAuditStatusVo.setSortColumns(WxWeappAuditStatus.Field.TenantId_ASC, WxWeappAuditStatus.Field.Type_ASC, WxWeappAuditStatus.Field.UserVersion_DESC);
weappAuditStatusVo.setSortColumns(WxWeappAuditStatus.Field.AuditTime_DESC, WxWeappAuditStatus.Field.TenantId_ASC, WxWeappAuditStatus.Field.Type_ASC, WxWeappAuditStatus.Field.UserVersion_DESC);
final PageInfo<WxWeappAuditStatusVo> page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize);
return new ResultData(page);
}
@@ -888,7 +888,7 @@ public class WxWeappInfoController extends BaseController {
weappReleaseStatusVo.setName(null);
}
}
weappReleaseStatusVo.setSortColumns(WxWeappReleaseStatus.Field.TenantId_ASC, WxWeappReleaseStatus.Field.Type_ASC,WxWeappReleaseStatus.Field.UserVersion_DESC);
weappReleaseStatusVo.setSortColumns(WxWeappReleaseStatus.Field.ReleaseTime_DESC, WxWeappReleaseStatus.Field.TenantId_ASC, WxWeappReleaseStatus.Field.Type_ASC,WxWeappReleaseStatus.Field.UserVersion_DESC);
final PageInfo<WxWeappReleaseStatusVo> page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize);
return new ResultData(page);
}


Загрузка…
Отмена
Сохранить