lyhzzz 1 maand geleden
bovenliggende
commit
debdca46fc

+ 3 - 0
src/main/java/com/fdkankan/manage/service/impl/JyPlatformServiceImpl.java

@@ -55,6 +55,9 @@ public class JyPlatformServiceImpl extends ServiceImpl<IJyPlatformMapper, JyPlat
         if(StringUtils.isNotBlank(param.getPhone())){
         if(StringUtils.isNotBlank(param.getPhone())){
             wrapper.like(JyPlatform::getPhone,param.getPhone());
             wrapper.like(JyPlatform::getPhone,param.getPhone());
         }
         }
+        if(param.getStatus() !=null){
+            wrapper.eq(JyPlatform::getStatus,param.getStatus());
+        }
         wrapper.orderByDesc(JyPlatform::getId);
         wrapper.orderByDesc(JyPlatform::getId);
         Page<JyPlatform> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Page<JyPlatform> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         return PageInfo.PageInfo(page);
         return PageInfo.PageInfo(page);

+ 5 - 0
src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -223,6 +223,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         jyUser.setPhone(param.getPhone());
         jyUser.setPhone(param.getPhone());
         jyUser.setIdCard(param.getIdCard());
         jyUser.setIdCard(param.getIdCard());
         jyUser.setIsJm(param.getIsJm());
         jyUser.setIsJm(param.getIsJm());
+
+        if(param.getPlatformId() != null){
+            jyUser.setPlatformId(param.getPlatformId());
+        }
+
         if(param.getIsJm() != null && param.getIsJm() == 1){
         if(param.getIsJm() != null && param.getIsJm() == 1){
             sysUser = sysUserService.getById(sysUser.getId());
             sysUser = sysUserService.getById(sysUser.getId());
             if(sysUser.getRoleId() == 48L ){
             if(sysUser.getRoleId() == 48L ){

+ 2 - 0
src/main/java/com/fdkankan/manage/vo/request/JyPlatformParam.java

@@ -20,4 +20,6 @@ public class JyPlatformParam extends RequestBase{
      * 平台管理手机号码
      * 平台管理手机号码
      */
      */
     private String phone;
     private String phone;
+
+    private Integer status;
 }
 }

+ 2 - 0
src/main/java/com/fdkankan/manage/vo/request/UserParam.java

@@ -31,6 +31,8 @@ public class UserParam extends RequestBase {
 
 
     private Integer isJm ;
     private Integer isJm ;
 
 
+    private Integer platformId ;
+
     public String getPhone() {
     public String getPhone() {
         return StringUtils.isBlank(phone)?null:phone;
         return StringUtils.isBlank(phone)?null:phone;
     }
     }