Commit 3ff39a7e authored by fenghuazhong's avatar fenghuazhong

修改返回类型

parent 0f9443dd
...@@ -7,6 +7,8 @@ import io.swagger.annotations.Api; ...@@ -7,6 +7,8 @@ import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List; import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.AttachmentServiceImpl; import com.yeejoin.amos.boot.module.ugp.biz.service.impl.AttachmentServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
...@@ -123,7 +125,7 @@ public class AttachmentController extends BaseController { ...@@ -123,7 +125,7 @@ public class AttachmentController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/unit") @GetMapping(value = "/unit")
@ApiOperation(httpMethod = "Get",value="单位选择查询",notes= "单位选择查询") @ApiOperation(httpMethod = "Get",value="单位选择查询",notes= "单位选择查询")
public ResponseModel<String> selectUnit(){ public ResponseModel<Map> selectUnit(){
return ResponseHelper.buildResponse(attachmentServiceImpl.selectUnit()); return ResponseHelper.buildResponse(attachmentServiceImpl.selectUnit());
} }
} }
...@@ -17,7 +17,11 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil; ...@@ -17,7 +17,11 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.module.ugp.biz.controller.ProjectController; import com.yeejoin.amos.boot.module.ugp.biz.controller.ProjectController;
...@@ -81,14 +85,16 @@ public class AttachmentServiceImpl extends BaseService<AttachmentDto,Attachment, ...@@ -81,14 +85,16 @@ public class AttachmentServiceImpl extends BaseService<AttachmentDto,Attachment,
* *
*/ */
@BusinessIdentify @BusinessIdentify
public String selectUnit(){ public Map selectUnit(){
Map map = new HashMap<>();
//获取登录人的redis信息 //获取登录人的redis信息
ReginParams reginParams = orgServiceImpl.getReginParams(); ReginParams reginParams = orgServiceImpl.getReginParams();
//根据redis信息去获取登录人信息后再获取到登录人的sequenceNbr //根据redis信息去获取登录人信息后再获取到登录人的sequenceNbr
Long companyId = reginParams.getBusinessInfo().getCompanySequenceNbr(); Long companyId = reginParams.getBusinessInfo().getCompanySequenceNbr();
OrgUsr orgUsr = orgUsrService.getById(companyId); OrgUsr orgUsr = orgUsrService.getById(companyId);
String key = orgUsr.getOrgExpandAttr1(); String key = orgUsr.getOrgExpandAttr1();
return OrgEnum.map.get(key); map.put("type",OrgEnum.map.get(key));
return map;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment