我的家庭相关接口

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -13,6 +13,7 @@ import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import com.elink.esua.epdc.service.AppUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkCustomPersonroomController.java

@@ -4,16 +4,20 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO;
 import com.elink.esua.epdc.dto.personroom.form.*;
 import com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO;
 import com.elink.esua.epdc.service.CustomPersonroomService;
+import com.elink.esua.epdc.service.ImgConfigService;
 import com.elink.esua.epdc.service.WorkCustomPersonroomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 房屋
  *
@@ -27,6 +31,9 @@ public class ApiWorkCustomPersonroomController {
     @Autowired
     private WorkCustomPersonroomService workCustomPersonroomService;
 
+    @Autowired
+    private ImgConfigService imgConfigService;
+
     /**
      * 获取房屋信息
      *
@@ -99,13 +106,18 @@ public class ApiWorkCustomPersonroomController {
     }
 
 
-
+    /**
-
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
-
+     *
-
+     * @param dictType
-
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
-
+     * @Author zhangyong
-
+     * @Date 15:27 2020-05-27
+     **/
+    @GetMapping("heartImgType/{dictType}")
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType){
+        return imgConfigService.getListSimpleDictInfo(dictType);
+    }
 
 
 

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java

@@ -13,6 +13,7 @@ import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import com.elink.esua.epdc.service.AppUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 @ApiVersion(2)
 @RestController("ApiAppUserV2Controller")
 @RequestMapping("app-user")
+@Slf4j
 public class ApiAppUserV2Controller {
 
     @Autowired

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -835,7 +835,7 @@ public class AppUserServiceImpl implements AppUserService {
      */
     private String fixAndCheckIdentityNo(String identityNo, String partyFlag) {
         if (YesOrNoEnum.NO.value().equals(partyFlag)) {
-            return null;
+            return identityNo;
         }
         return fixAndCheckIdentityNo(identityNo);
     }