--no commit message

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/controller/activity/FgActivityApplyController.java

@@ -5,11 +5,15 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
 
+import javax.websocket.server.PathParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.core.commons.redis.Redis;
@@ -73,8 +77,10 @@ public class FgActivityApplyController {
 		entity.setStatus(AuditStatusEnum.NONE.getCode());
 		entity.setMemberName(fgRedisManageUser.getMember().getName());
 		entity.setMemberPhone(fgRedisManageUser.getMember().getPhone());
-		String id = fgRedisManageUser.getMember().getDepartmentId();
-		CallBack<DepartmentMemberVo> callBack = memberClient.get(Integer.parseInt(id));
+		//String id = fgRedisManageUser.getMember().getDepartmentId();
+		//CallBack<DepartmentMemberVo> callBack = memberClient.get(Integer.parseInt(id));
+		int id =17;
+		CallBack<DepartmentMemberVo> callBack = memberClient.get(id);
 		System.out.println(callBack.getData());
 		String DepartmentName = callBack.getData().getName();
 		entity.setMemberRealiationName(DepartmentName);
@@ -93,7 +99,7 @@ public class FgActivityApplyController {
 	//前台截取remark原因
 	@ApiOperation("获取审核不通过原因")
 	@GetMapping(SysUserRequestPath.GET)
-	public CallBack<List<AuditRecord>> get(Integer oid){
+	public CallBack<List<AuditRecord>> get(@RequestParam("oid") Integer oid){
 		CallBack<List<AuditRecord>> callBack = bgSysUserClient.get(oid);
 		return CallBack.success(callBack.getData());
 	}