合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/SysNation.java

@@ -5,18 +5,25 @@ import java.util.Date;
 public class SysNation {
     private Integer id;
 
+    /*地区代码*/
     private String code;
 
+    /*省份*/
     private String province;
 
+    /*城市*/
     private String city;
 
+     /*父级行政区划ID*/
     private Integer parentId;
 
+    /*创建时间*/
     private Date createTime;
 
+    /*县/区*/
     private String district;
 
+    /*最后修改时间*/
     private Date lastUpdateTime;
 
     private Integer operator;

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -44,7 +44,7 @@ public class FaceServicelimpl implements FaceServiceI {
         ResponseBean responseBean= new ResponseBean();
          String faceImg =img(uploadFile);
         /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
-        if (null!= otherUserId && !userid.equals(otherUserId)) {
+        if (null!= otherUserId) {
                  responseBean = getTaFaceParentId(userid, otherUserId);
             if ("1".equals(responseBean.getCode())){
                 responseBean.getMessage();
@@ -80,7 +80,7 @@ public class FaceServicelimpl implements FaceServiceI {
         boolean isA = false;
       ResponseBean responseBean= new ResponseBean();
         String faceImg =img(uploadFile);
-        if (null!= otherUserId && !userId.equals(otherUserId)) {
+        if (null!= otherUserId) {
                  responseBean = getTaFaceParentId(userId, otherUserId);
             if ("1".equals(responseBean.getCode())) {
                 responseBean.getMessage();
@@ -160,7 +160,7 @@ public class FaceServicelimpl implements FaceServiceI {
     public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId) {
         ResponseBean responseBean= new ResponseBean();
         /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
-        if (null!= otherUserId && !userId.equals(otherUserId)) {
+        if (null!= otherUserId) {
             responseBean = getTaFaceParentId(userId, otherUserId);
             if ("1".equals(responseBean.getCode())) {
                 responseBean.getMessage();
@@ -182,12 +182,13 @@ public class FaceServicelimpl implements FaceServiceI {
      *判断当前用户下的人员关系（家属，租客）
      */
     public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
-       ResponseBean  responseBean= new ResponseBean();
-/*         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserId);*/
+        ResponseBean  responseBean= new ResponseBean();
         TaUser  users= taUserMapper.selectByPrimaryKey(otherUserId);
-        if (null!= users && !users.getParentId().equals(userId)){
-            responseBean.addError("您输入的家属或租户ID有误");
-            return responseBean;
+        if (null == users || !userId.equals(users.getParentId())){
+                responseBean.addError("您输入的家属或租户ID有误");
+
+        }else if (userId.equals(otherUserId)){
+               responseBean.addError("您输入的家属或租户ID有误");
         }
         return responseBean;
     }