入参修改

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -35,6 +35,7 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.RegexValidateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.BaseIdVO;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
@@ -682,9 +683,9 @@ public class UserFacade extends UserServiceImpl {
      * @param userId
      * @return 删除用户信息和机构信息
      */
-    public RespDTO<Boolean> updateDeleteds(String userId) {
+    public RespDTO<Boolean> updateDeleteds(BaseIdVO baseIdVO) {
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("userId", userId);
+        map.put("userId", baseIdVO.getId());
         map.put("modifier", UserUtils.getCurrentPrincipleID());
         map.put("gmtModified", DateUtil.now());
         boolean res = updateDeleted(map);

user-service/src/main/java/com/diagbot/vo/OrganizationNameVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 模糊查询机构
+ * @author wangfeng
+ * @date 2018年9月28日 下午2:44:31
+ */
+@Setter
+@Getter
+public class OrganizationNameVO {
+	
+	private String organizationName;
+
+}

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -24,6 +24,8 @@ import com.diagbot.facade.OrganizationFacade;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.facade.UserOrganizationFacade;
+import com.diagbot.vo.BaseIdVO;
+import com.diagbot.vo.OrganizationNameVO;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
@@ -85,15 +87,16 @@ public class UserInfoController {
     @PostMapping("/updateDeleted")
     @SysLogger("updateDeleted")
     @Transactional
-    public RespDTO<Boolean> updateDeleted(@RequestParam String userId) {
-        return userFacade.updateDeleteds(userId);
+    public RespDTO<Boolean> updateDeleted(@RequestParam BaseIdVO baseIdVO) {
+        return userFacade.updateDeleteds(baseIdVO);
     }
 
     @ApiOperation(value = "模糊查询机构信息[by:wangfeng]", notes = "机构信息")
     @PostMapping("/findOrganization")
     @SysLogger("findOrganization")
-    public RespDTO<Organization> findOrganization(@RequestParam String organizationName) {
+    public RespDTO<Organization> findOrganization(@RequestBody OrganizationNameVO organizationNameVO) {
         // TODO 返回机构Id和机构
+    	String organizationName = organizationNameVO.getOrganizationName();
         List<Organization> organization = organizationFacade.findOrganization(organizationName);
 
         return RespDTO.onSuc(organization);