Merge remote-tracking branch 'origin/alert' into alert

suishenbang-api/src/main/java/com/dgtly/api/controller/SysUserController.java

@@ -171,10 +171,22 @@ public class SysUserController extends ApiBaseController {
     }
 
     @PostMapping("/searchOrg")
-    @ResponseBody
-    public Map searchProductParamByCustomerCode(@RequestBody OrderSalesParameter salesManager) {
-        if("".equals(salesManager.getParType()) || salesManager.getParType() ==null){
+    @ApiOperation(value = "查询组织机构",
+            notes = "参数：{parType:'xxxxxxxxxxxxxxxxxxxx'," +
+                    "parValue:'xxx'")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body")
+    })
+    public Map searchProductParamByCustomerCode() {
+        ParameterObject obj =  getParameterObject();
+        OrderSalesParameter salesManager =new OrderSalesParameter();
+        String parType = obj.getString("parType");
+        String parValue = obj.getString("parValue");
+        if("".equals(parType) ||parType ==null){
             salesManager.setParType("div_level");
+        }else{
+            salesManager.setParType(parType);
+            salesManager.setParValue(parValue);
         }
         Map map = new HashMap();
         List<Map<String,Object>> dataList = alertConfigurationService.searchProductParamByCustomerCode(