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

Merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
febd754f16
3 измененных файлов: 3 добавлений и 11 удалений
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java
  2. +0
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java Просмотреть файл

@@ -54,12 +54,11 @@ public class WxFloatingLayerController extends BaseController {
wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode());
wxFloatingLayer.setTenantId(getTenantId());
try {
wxFloatingLayerService.saveOrUpdate(wxFloatingLayer);
return wxFloatingLayerService.saveOrUpdate(wxFloatingLayer);
} catch (MallinkException e) {
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
}
return new ResultData();
}

@ApiOperation("根据id更新接口")


+ 0
- 7
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java Просмотреть файл

@@ -9,7 +9,6 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumMallUserStatus;
import com.iformall.enums.EnumUserAdmin;
import com.iformall.enums.EnumFlowPermissionType;
import com.iformall.service.*;
import com.iformall.shiro.PasswordHelper;
import com.iformall.shiro.UserSession;
@@ -17,7 +16,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
@@ -27,7 +25,6 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
@@ -72,10 +69,6 @@ public class MallUserInfoController extends BaseController {
public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage");

if(userInfo.getWithWechatNotFormat() != null){
userInfo.setWithWechatForQuery(userInfo.getWithWechatNotFormat());
}

userInfo.setTenantId(getTenantId());
userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC);
final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize);


+ 2
- 2
mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml Просмотреть файл

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



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