Selaa lähdekoodia

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

傅行帆 5 vuotta sitten
vanhempi
commit
9afa65360d

+ 2
- 0
src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java Näytä tiedosto

1
 package com.huiju.estateagents.center.taUser.entity;
1
 package com.huiju.estateagents.center.taUser.entity;
2
 
2
 
3
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
 import com.baomidou.mybatisplus.annotation.IdType;
4
 import com.baomidou.mybatisplus.annotation.TableField;
5
 import com.baomidou.mybatisplus.annotation.TableField;
5
 import com.baomidou.mybatisplus.annotation.TableId;
6
 import com.baomidou.mybatisplus.annotation.TableId;
116
     /**
117
     /**
117
      * 权重
118
      * 权重
118
      */
119
      */
120
+    @TableField(strategy= FieldStrategy.IGNORED)
119
     private String weight;
121
     private String weight;
120
 
122
 
121
     /**
123
     /**

+ 3
- 0
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java Näytä tiedosto

476
 		if (!StringUtils.isEmpty(taUser.getWeight()) && taUser.getWeight().length() > 11){
476
 		if (!StringUtils.isEmpty(taUser.getWeight()) && taUser.getWeight().length() > 11){
477
 			throw new Exception("权重最大为11位");
477
 			throw new Exception("权重最大为11位");
478
 		}
478
 		}
479
+		if (StringUtils.isEmpty(taUser.getWeight())){
480
+			taUser.setWeight(null);
481
+		}
479
 		if(StringUtils.isEmpty(taUser.getLoginName()) && taUserBefore.getLoginName().equals(taUserBefore.getPhone())){
482
 		if(StringUtils.isEmpty(taUser.getLoginName()) && taUserBefore.getLoginName().equals(taUserBefore.getPhone())){
480
 			taUser.setLoginName(taUser.getPhone());
483
 			taUser.setLoginName(taUser.getPhone());
481
 		}
484
 		}