company:add优惠券

fs-company/src/main/java/com/fs/company/controller/store/FsUserController.java

@@ -233,6 +233,10 @@ public class FsUserController extends BaseController
     public TableDataInfo userlist(@PathVariable("name")String name)
     {
         List<UserVo> list = fsUserService.selectUserVOList(name);
+        if (list==null|| list.isEmpty()){
+            String s = encryptPhone(name);
+            list = fsUserService.selectUserVOList(s);
+        }
         return getDataTable(list);
     }
 

fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -6,6 +6,7 @@ import com.fs.app.annotation.Login;
 import com.fs.app.param.FsDoctorRegisterParam;
 import com.fs.app.param.FsUserEditParam;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.sign.Md5Utils;
@@ -23,6 +24,7 @@ import com.fs.his.utils.qrcode.QRCodeUtils;
 import com.fs.his.vo.FsDoctorListUVO;
 import com.fs.his.vo.FsUserCouponCountUVO;
 import com.fs.his.vo.FsUserCouponListUVO;
+import com.fs.his.vo.UserVo;
 import com.fs.qw.service.IQwAppContactWayService;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
@@ -277,4 +279,18 @@ public class UserController extends  AppBaseController {
         return userService.updateStatus(id);
     }
 
+    /**
+     * 查询用户
+     */
+    @GetMapping("/user/list/{name}")
+    public TableDataInfo userlist(@PathVariable("name")String name)
+    {
+        List<UserVo> list = userService.selectUserVOList(name);
+        if (list==null|| list.isEmpty()){
+            String s = encryptPhone(name);
+            list = userService.selectUserVOList(s);
+        }
+        return getDataTable(list);
+    }
+
 }