接口完成

pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/CarOrderServiceImpl.java

@@ -48,7 +48,6 @@ public class CarOrderServiceImpl implements CarOrderService {
 
         log.info("getCarOrderList");
         try {
-
             return carOrderDao.queryAll(record);
         } catch (Exception e) {
             log.error("getCarOrderList", e);
@@ -64,7 +63,9 @@ public class CarOrderServiceImpl implements CarOrderService {
         log.info("getCarOrderByPage");
         try {
             //TODO 目前提供的测试账号查询不到数据 暂时查询所有的 注释去掉即可根据登录用户查询
-//            record.setCarSupplier(ShiroUtils.getShiroUserInfo().getUserName());
+            if (!ShiroUtils.getShiroUserInfo().getUserName().contains("超级管理员")) {
+                record.setCarSupplier(ShiroUtils.getShiroUserInfo().getUserName());
+            }
             Map<String, Object> parameter = new HashMap<String, Object>();
             parameter.put("record", record);
             parameter.put("page", page);
@@ -246,7 +247,7 @@ public class CarOrderServiceImpl implements CarOrderService {
             if (maps.get("code").equals("1")) {
                 return true;
             } else {
-               throw new ApiException(maps.get("msg").toString());
+                throw new ApiException(maps.get("msg").toString());
             }
         } catch (Exception e) {
             log.error("offlineReview", e);

pine-admin/src/main/java/com/pine/admin/modules/system/controller/SysUserLoginController.java

@@ -13,6 +13,7 @@ import com.pine.admin.shiro.DealerOpenIdToken;
 import com.pine.admin.shiro.ShiroUtils;
 import com.pine.admin.shiro.WxOpenIdToken;
 import com.pine.common.dto.Result;
+import com.pine.common.exception.ApiException;
 import com.pine.common.utils.CookieUtil;
 import com.pine.common.utils.MD5Util;
 import com.pine.common.utils.PasswordEncryptorUtils;
@@ -116,11 +117,16 @@ public class SysUserLoginController {
             String s2 = PostUtil.formUpload("http://47.100.17.208:8280/api/auth/sys-user/getShopRoleByAccountAndPassword", map, null, "");
             Map maps = (Map) JSON.parse(s2);
 
-            if (maps.get("code").equals("-1")){
-                return Result.error("密码错误");
+            if (maps.get("code").equals(-1)){
+                return Result.error(maps.get("msg").toString());
+            }
+            DealerOpenIdToken dealerOpenIdToken;
+            if (null == maps.get("data")){
+                String dd = "{\"erp\":\"8888\",\"dealerId\":8888,\"name\":\"超级管理员\",\"roleType\":\"超级管理员\"}";
+                 dealerOpenIdToken = new DealerOpenIdToken(dd);
+            }else {
+                dealerOpenIdToken = new DealerOpenIdToken(maps.get("data").toString());
             }
-
-            DealerOpenIdToken dealerOpenIdToken = new DealerOpenIdToken(maps.get("data").toString());
             Subject subject = SecurityUtils.getSubject();
             subject.login(dealerOpenIdToken);
             SecurityUtils.getSubject().getSession().setTimeout(-1000L);
@@ -140,8 +146,8 @@ public class SysUserLoginController {
             return Result.error("账户验证失败");
         } catch (Exception e) {
             e.printStackTrace();
+            throw new ApiException(e.getMessage());
         }
-        return Result.success(true, ShiroUtils.getShiroUserInfo());
     }
 
     /**