Fix用户管理服务商账号登录用户类型未过滤

VB_DSM_V2.1/vbdsm-web/vbdsm-manage/src/main/java/cn/vbdsm/manage/mvc/action/web/BaseCodeAction.java

@@ -1,12 +1,10 @@
 package cn.vbdsm.manage.mvc.action.web;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.core.common.ResultMsg;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import cn.vbdsm.core.mvc.action.BaseAction;
+import cn.vbdsm.manage.service.IBaseCodeService;
+import cn.vbdsm.manage.vo.BaseCodeTreeVo;
+import cn.vbdsm.model.BaseCode;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -15,115 +13,137 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.alibaba.fastjson.JSONObject;
-import cn.vbdsm.core.mvc.action.BaseAction;
-import cn.vbdsm.manage.service.IBaseCodeService;
-import cn.vbdsm.manage.vo.BaseCodeTreeVo;
-import cn.vbdsm.model.BaseCode;
+import javax.core.common.ResultMsg;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/web/code")
 public class BaseCodeAction extends BaseAction {
-	
-	@Autowired IBaseCodeService baseCodeService;
-		
-	/**
-	 * 获取所有代码
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequestMapping(value="/getListAll.json")
-	public ModelAndView getListAll(@RequestParam(value="id",required=false) String soleCode, HttpServletRequest request,HttpServletResponse response) {
-		String local = super.getLocal(request);
-		ResultMsg<List<BaseCodeTreeVo>> result = baseCodeService.getTreeBaseCode(local);
-		return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
-	}
-	
-	/**
-	 * 根据上级唯一代码获取下级基础代码列表
-	 * @param soleCode	唯一代码
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequestMapping(value="/getList/{soleCode}.json")
-	public ModelAndView getListBySoleCode(@PathVariable(value="soleCode") String soleCode, HttpServletRequest request,HttpServletResponse response) {
-		String local = super.getLocal(request);
-		ResultMsg<List<BaseCode>> result = baseCodeService.getListBySoleCode(local,soleCode);
-		return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
-	}
-	
-	/**
-	 * 添加一个基础代码
-	 * @param baseCode
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequestMapping(value="/addOne.json")
-	public ModelAndView addOneBaseCode(@ModelAttribute BaseCode baseCode, HttpServletRequest request,HttpServletResponse response) {
-		String local = super.getLocal(request);
-		ResultMsg<BaseCode> result = baseCodeService.addOneBaseCode(local,baseCode);
-		return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
-	}
-	
-	/**
-	 * 修改一个基础代码
-	 * @param baseCode
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequestMapping(value="/modifyOne/{soleCode}.json")
-	public ModelAndView addOneBaseCode(@PathVariable(value="soleCode") String soleCode, @ModelAttribute BaseCode baseCode, HttpServletRequest request,HttpServletResponse response) {
-		String local = super.getLocal(request);
-		ResultMsg<BaseCode> result = baseCodeService.modifyOneBaseCode(local,soleCode, baseCode);
-		return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
-	}
-	
-	/**
-	 * 删除节点，如果是根节点则递归删除
-	 * @param soleCode
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequestMapping(value="/delete/{soleCode}.json")
-	public ModelAndView deleteOne(@PathVariable(value="soleCode") String soleCode, HttpServletRequest request,HttpServletResponse response) {
-		String local = super.getLocal(request);
-		ResultMsg<BaseCode> result = baseCodeService.delOneBaseCode(local,soleCode);
-		return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
-	}
-	
-	
-	
-	/**
-	 * 获取代码级联数据
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequestMapping("getComboxData.json")
-	public ModelAndView getComboxData(HttpServletRequest request,HttpServletResponse response,@RequestParam(value="superCode",defaultValue="0",required=false) String superCode){
-		String local = super.getLocal(request);
-		List<Map<String, Object>> mapList = baseCodeService.getComboxData(local, superCode);
-		return super.callBackForJsonp(request, response, JSONObject.toJSONString(mapList));
-	}
-	
-	
-	/**
-	 * 获取代码级联数据
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequestMapping("getComboxDataByOrgId.json")
-	public ModelAndView getComboxDataByOrgId(HttpServletRequest request,HttpServletResponse response,@RequestParam(value="superCode",defaultValue="0",required=false) String superCode,@RequestParam("orgId") Long orgId){
-		String local = super.getLocal(request);
-		List<Map<String, Object>> mapList = baseCodeService.getComboxData(local, superCode,orgId);
-		return super.callBackForJsonp(request, response, JSONObject.toJSONString(mapList));
-	}
+
+    @Autowired
+    IBaseCodeService baseCodeService;
+
+    /**
+     * 获取所有代码
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/getListAll.json")
+    public ModelAndView getListAll(@RequestParam(value = "id", required = false) String soleCode, HttpServletRequest request, HttpServletResponse response) {
+        String local = super.getLocal(request);
+        ResultMsg<List<BaseCodeTreeVo>> result = baseCodeService.getTreeBaseCode(local);
+        return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
+    }
+
+    /**
+     * 根据上级唯一代码获取下级基础代码列表
+     *
+     * @param soleCode 唯一代码
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/getList/{soleCode}.json")
+    public ModelAndView getListBySoleCode(@PathVariable(value = "soleCode") String soleCode, HttpServletRequest request, HttpServletResponse response) {
+        String local = super.getLocal(request);
+        ResultMsg<List<BaseCode>> result = baseCodeService.getListBySoleCode(local, soleCode);
+        if (soleCode.equals("01080000")) {
+            JSONObject userInfo = super.getUserInfo(request);
+            String userType = userInfo.getJSONObject("user").getString("userType");
+            if (userType.equals("01080004")) {
+                List<BaseCode> codeList = new ArrayList<BaseCode>();
+                for (BaseCode code : result.getData()) {
+                    if (code.getCodeSole().equals("01080005")) {
+                        codeList.add(code);
+                    }
+                }
+                result.setData(codeList);
+            }
+        }
+
+        return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
+    }
+
+    /**
+     * 添加一个基础代码
+     *
+     * @param baseCode
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/addOne.json")
+    public ModelAndView addOneBaseCode(@ModelAttribute BaseCode baseCode, HttpServletRequest request, HttpServletResponse response) {
+        String local = super.getLocal(request);
+        ResultMsg<BaseCode> result = baseCodeService.addOneBaseCode(local, baseCode);
+        return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
+    }
+
+    /**
+     * 修改一个基础代码
+     *
+     * @param baseCode
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/modifyOne/{soleCode}.json")
+    public ModelAndView addOneBaseCode(@PathVariable(value = "soleCode") String soleCode, @ModelAttribute BaseCode baseCode, HttpServletRequest request, HttpServletResponse response) {
+        String local = super.getLocal(request);
+        ResultMsg<BaseCode> result = baseCodeService.modifyOneBaseCode(local, soleCode, baseCode);
+        return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
+    }
+
+    /**
+     * 删除节点，如果是根节点则递归删除
+     *
+     * @param soleCode
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/delete/{soleCode}.json")
+    public ModelAndView deleteOne(@PathVariable(value = "soleCode") String soleCode, HttpServletRequest request, HttpServletResponse response) {
+        String local = super.getLocal(request);
+        ResultMsg<BaseCode> result = baseCodeService.delOneBaseCode(local, soleCode);
+        return super.callBackForJsonp(request, response, JSONObject.toJSONString(result));
+    }
+
+
+    /**
+     * 获取代码级联数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("getComboxData.json")
+    public ModelAndView getComboxData(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "superCode", defaultValue = "0", required = false) String superCode) {
+        String local = super.getLocal(request);
+        List<Map<String, Object>> mapList = baseCodeService.getComboxData(local, superCode);
+        return super.callBackForJsonp(request, response, JSONObject.toJSONString(mapList));
+    }
+
+
+    /**
+     * 获取代码级联数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("getComboxDataByOrgId.json")
+    public ModelAndView getComboxDataByOrgId(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "superCode", defaultValue = "0", required = false) String superCode, @RequestParam("orgId") Long orgId) {
+        String local = super.getLocal(request);
+        List<Map<String, Object>> mapList = baseCodeService.getComboxData(local, superCode, orgId);
+        return super.callBackForJsonp(request, response, JSONObject.toJSONString(mapList));
+    }
 
 
 }