From 43dd033ab86866df3113bc4c09c3323bb95d58b4 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Thu, 13 Jun 2024 10:34:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/model/LoginUser.java | 9 ++ securitycontrol-auth/pom.xml | 21 +++- .../auth/controller/TokenController.java | 98 ++++++++++++++----- .../auth/service/SysLoginService.java | 9 +- .../entity/system/SystemGlobal.java | 4 + .../securitycontrol-Interface/pom.xml | 5 + .../inter/mapper/BdMapper.java | 8 ++ .../inter/service/BdServiceImpl.java | 65 +++++++++++- .../src/main/resources/mapper/BdMapper.xml | 7 +- .../main/resources/mapper/DeviceBdMapper.xml | 6 +- .../system/controller/LoginController.java | 1 + .../system/controller/UserController.java | 4 + .../system/mapper/LoginMapper.java | 3 + .../system/service/LoginService.java | 2 + .../system/service/LoginServiceImpl.java | 10 ++ .../src/main/resources/mapper/LoginMapper.xml | 4 +- 16 files changed, 222 insertions(+), 34 deletions(-) diff --git a/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/model/LoginUser.java b/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/model/LoginUser.java index 3d8d368..99e3067 100644 --- a/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/model/LoginUser.java +++ b/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/model/LoginUser.java @@ -68,6 +68,15 @@ public class LoginUser implements Serializable * */ private String iscUserId; + private String test; + + public String getTest() { + return test; + } + + public void setTest(String test) { + this.test = test; + } public static long getserialversionuid() { return serialVersionUID; diff --git a/securitycontrol-auth/pom.xml b/securitycontrol-auth/pom.xml index dd1a9d3..f2d0550 100644 --- a/securitycontrol-auth/pom.xml +++ b/securitycontrol-auth/pom.xml @@ -105,7 +105,26 @@ isc_sm_agent 1.0 system - ${project.basedir}/libs/isc_sm_agent-1.0.jar + ${project.basedir}/libs/isc_sm_agent-2.0.jar + + + gson + gson + 1.0 + system + ${project.basedir}/libs/gson-2.6.2.jar + + + commons-lang + commons-lang + 2.1 + + + json + json + 1.0 + system + ${project.basedir}/libs/json-20220320.jar com.thoughtworks.xstream diff --git a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/controller/TokenController.java b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/controller/TokenController.java index efee330..c107b30 100644 --- a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/controller/TokenController.java +++ b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/controller/TokenController.java @@ -1,9 +1,7 @@ package com.securitycontrol.auth.controller; - -import cn.hutool.http.HttpResponse; -import cn.hutool.http.HttpUtil; import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Maps; import com.securitycontrol.auth.form.LoginBody; import com.securitycontrol.auth.service.SysLoginService; @@ -12,13 +10,18 @@ import com.securitycontrol.common.core.constant.Constant; import com.securitycontrol.common.core.constant.SecurityConstants; import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.common.core.utils.JwtUtils; +import com.securitycontrol.common.core.utils.aes.ListHelper; import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.common.redis.service.RedisService; import com.securitycontrol.common.security.service.TokenService; import com.securitycontrol.common.security.utils.SecurityUtils; import com.securitycontrol.system.api.domain.decision.SysMenu; import com.securitycontrol.system.api.model.LoginUser; +import com.sgcc.isc.core.orm.complex.FunctionNode; +import com.sgcc.isc.core.orm.complex.FunctionTree; import com.sgcc.isc.core.orm.identity.User; +import com.sgcc.isc.core.orm.resource.Function; +import com.sgcc.isc.core.orm.role.Role; import com.sgcc.isc.framework.common.constant.Constants; import com.sgcc.isc.service.adapter.factory.AdapterFactory; import com.sgcc.isc.service.adapter.helper.IIdentityService; @@ -27,18 +30,18 @@ import io.jsonwebtoken.Claims; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.util.Base64Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.awt.*; import java.util.*; +import java.util.List; import java.util.stream.Collectors; /** @@ -63,37 +66,43 @@ public class TokenController { @Autowired private SysRecordLogService recordLogService; - - @Value("${isc.url}") - private String url; - @Value("${isc.appId}") private String appId; @PostMapping("login") public Result login(@RequestBody LoginBody form) { - // Map map=getIscLogin(form.getUsername(), form.getPassword()); - LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getLoginType(), null); + + String osName = System.getProperty("os.name").toLowerCase(); + if (osName.contains("windows")) { + LoginUser userInfo2 = sysLoginService.login(form.getUsername(),form.getPassword(), form.getLoginType(), null); + // 获取登录token + return Result.ok(tokenService.createToken(userInfo2), "登录成功"); + } + Map map=getIscLogin(form.getUsername(), form.getPassword()); + List menu= (List) map.get("menu"); + String password=map.get("pwd").toString(); + log.info("密码====>{}",password); + LoginUser userInfo2 = sysLoginService.login(form.getUsername(),password, form.getLoginType(), menu); // 获取登录token - return Result.ok(tokenService.createToken(userInfo), "登录成功"); + return Result.ok(tokenService.createToken(userInfo2), "登录成功"); } private Map getIscLogin(String username, String password) { Map map= Maps.newHashMap(); - Boolean isLogin=false; try{ - System.err.println(3); - IIdentityService service=(IIdentityService )AdapterFactory.getInstance(Constants.CLASS_IDENTITY); + IIdentityService service=(IIdentityService)AdapterFactory.getInstance(Constants.CLASS_IDENTITY); + IResourceService iResourceService=(IResourceService)AdapterFactory.getInstance(Constants.CLASS_RESOURCE); User user=service.userLoginAuth(username,password); - log.info(user.getId()); - log.info("user--->{}", user); - log.info(user.toString()); - HashMap maps=service.getObjectsByUserId(user.getId(),appId); - for (Map.Entry entry : maps.entrySet()) { - System.out.println("Key = " + entry.getKey()); - log.info("list--->{}", entry.getValue()); - } + FunctionTree tree= iResourceService.getFuncTree(user.getId(),"9bb295b78f95350d018fc23d3f284f1f",""); + log.info("有菜单数据了--->{}",tree); + List menus= getMenuList(tree); + log.info("草段全部获取成功====>{}",tree); + log.info("菜单数据---->{}",menus.toArray()); + map.put("menu",menus); + map.put("isL","true"); + map.put("pwd","Bonus@admin123"); + map.put("loginName",username); }catch (Exception e){ map.put("menu",new ArrayList<>()); map.put("isL","false"); @@ -104,7 +113,48 @@ public class TokenController { return map; } - + public List getMenuList( FunctionTree tree){ + List list = new ArrayList(); + try{ + List nodeList=tree.getFuncNode(); + log.info("nodeList--->{}",nodeList); + nodeList.forEach((value) -> { + log.info("数据展示value -->{}",value); + SysMenu menu = new SysMenu(); + List menuChilders = new ArrayList<>(); + Function currentNode = value.getCurrentNode(); + menu.setMenuId(currentNode.getId()); + menu.setMenuName(currentNode.getName()); + menu.setMenuAuth(currentNode.getBusiCode()); + String url = currentNode.getUrl(); + menu.setUrl(url); + menu.setIcon("chart"); + List nextNode = value.getNextNode(); + menu.setLast(ListHelper.isEmpty(nextNode)); + log.info("nextNode----->{}",nextNode); + nextNode.forEach(functionNode->{ + log.info("functionNode----->{}",functionNode); + SysMenu menuChilder = new SysMenu(); + Function currentNodeChilder = functionNode.getCurrentNode(); + log.info("currentNodeChilder----->{}",currentNodeChilder); + String funType = currentNodeChilder.getFuncType(); + System.err.println(funType); + menuChilder.setMenuAuth(currentNodeChilder.getBusiCode()); + menuChilder.setMenuId(currentNodeChilder.getId()); + menuChilder.setMenuName(currentNodeChilder.getName()); + menuChilder.setUrl(currentNodeChilder.getUrl()); + menuChilder.setLast(true); + menuChilders.add(menuChilder); + }); + menu.setChilder(menuChilders); + list.add(menu); + }); + log.info("nodeList--->{}",list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return list; + } /** diff --git a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysLoginService.java b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysLoginService.java index 64c762a..bbd015d 100644 --- a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysLoginService.java +++ b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysLoginService.java @@ -7,6 +7,7 @@ import com.securitycontrol.common.core.enums.UserStatus; import com.securitycontrol.common.core.exception.ServiceException; import com.securitycontrol.common.core.utils.ServletUtils; import com.securitycontrol.common.core.utils.StringUtils; +import com.securitycontrol.common.core.utils.aes.ListHelper; import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.common.core.utils.ip.IpUtils; import com.securitycontrol.common.redis.service.RedisService; @@ -111,8 +112,12 @@ public class SysLoginService } } passwordService.validate(user, password); - Result> menu = remoteUserService.getAllMenuList(user.getUserId()+"", SecurityConstants.INNER); - list = handleMenuList(menu.getData(),loginType); + if(ListHelper.isEmpty(list)){ + Result> menu = remoteUserService.getAllMenuList(user.getUserId()+"", SecurityConstants.INNER); + list = handleMenuList(menu.getData(),loginType); + }else{ + list = handleMenuList(list,loginType); + } user.setJumpType(loginType); userInfo.getSysUser().setMenus(list); String hisIp=redisUtil.getVal(username); diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java index 1106196..589fd2b 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java @@ -99,6 +99,10 @@ public class SystemGlobal { public final static String TEXT_FIX=".text"; + public final static String IMAGE_BAST64_SUX="data:image/jpg;base64,"; + + + public final static String IMAGE_ID="image"; /** * 环境监测编码 */ diff --git a/securitycontrol-model/securitycontrol-Interface/pom.xml b/securitycontrol-model/securitycontrol-Interface/pom.xml index 93bab99..593befc 100644 --- a/securitycontrol-model/securitycontrol-Interface/pom.xml +++ b/securitycontrol-model/securitycontrol-Interface/pom.xml @@ -96,6 +96,11 @@ com.securitycontrol securitycontrol-commons-entity + + com.securitycontrol + securitycontrol-background + 3.6.1 + ${project.artifactId} diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/mapper/BdMapper.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/mapper/BdMapper.java index 2ff586c..df538bb 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/mapper/BdMapper.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/mapper/BdMapper.java @@ -1,5 +1,6 @@ package com.securitycontrol.inter.mapper; +import com.securitycontrol.entity.file.FileExportVo; import com.securitycontrol.inter.vo.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -143,4 +144,11 @@ public interface BdMapper { * @param selectDataVo */ void updateDeviceState(SelectDataVo selectDataVo); + + /** + * 新增资源 + * @param vo + * @return + */ + int addSource(FileExportVo vo); } diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java index 89e91f3..a4eb3fb 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java @@ -11,6 +11,7 @@ import com.securitycontrol.common.core.utils.aes.ListHelper; import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.common.core.utils.uuid.IdUtils; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.file.FileExportVo; import com.securitycontrol.entity.system.SystemGlobal; import com.securitycontrol.inter.mapper.BdMapper; import com.securitycontrol.inter.vo.*; @@ -24,8 +25,11 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; /** * 边带业务处理层 @@ -42,6 +46,9 @@ public class BdServiceImpl { private RemoteSourceService remoteSourceService; @Resource private RemoteFileService remoteFileService; +// @Resource +// private SourceFileService sourceFileService; + /** * * @param param @@ -180,23 +187,49 @@ public class BdServiceImpl { //json数据 String json=param.getData(); JSONObject data=JSON.parseObject(json); + JSONObject copyData=JSON.parseObject(json); + if(json.contains("image")){ + copyData.remove("image"); + } String isWarn=param.getIsWarn(); if(StringHelper.isEmpty(isWarn)){ isWarn=SystemGlobal.WARN_DEFEAT; } //数据源 String sourceType=IdUtils.getuid(); + //图片id //获取全部key Set keys=data.keySet(); String finalIsWarn = isWarn; + AtomicReference msg=null; keys.forEach(key->{ //查询系统的id SelectDataVo selectDataVo=mapper.getBdDeviceDetailByIdCode(id,key); if(selectDataVo!=null){ - String value=data.getString(key); - selectDataVo.setValue(value); + //如果key是图片 + if(SystemGlobal.IMAGE_ID.equals(key)){ + //这个是图片-bast64 + String value=data.getString(key); + String val=IdUtils.getuid(); + selectDataVo.setValue(val); + Result result=remoteFileService.uploadFileByBase64(SystemGlobal.IMAGE_BAST64_SUX+value,SecurityConstants.INNER); + if(result.getCode()==SystemGlobal.SUCCESS_CODE){ + Object list= result.getData(); + Result res= addSourceList(list, val,"人员出入","1"); + if(res.getCode()!=SystemGlobal.SUCCESS_CODE){ + msg.set("图片上传失败"); + }else { + msg.set("上传成功"); + } + }else { + msg.set("图片上传失败"); + } + }else{ + String value=data.getString(key); + selectDataVo.setValue(value); + } + selectDataVo.setSourceData(copyData.toString()); selectDataVo.setChangeValue(getChangeValue(selectDataVo)); - selectDataVo.setSourceData(json); selectDataVo.setIsWarn(finalIsWarn); selectDataVo.setDataTime(param.getDataTime()); selectDataVo.setSourceType(sourceType); @@ -204,15 +237,39 @@ public class BdServiceImpl { mapper.updateDeviceState(selectDataVo); insertHistoryValue(selectDataVo); } - }); + if(StringHelper.isEmpty(msg.get())){ + return AjaxResult.success(msg.get()); + } + }catch (Exception e){ log.error(e.toString(),e); return AjaxResult.success(0); } return AjaxResult.success(1); } + public Result addSourceList(Object object,String id,String sourceType,String fileType) { + try{ + if(object==null){ + return Result.fail("参数不能为空"); + } + String jsonObject= com.alibaba.fastjson2.JSON.toJSONString(object); + FileExportVo fileExportVo= com.alibaba.fastjson2.JSON.parseObject(jsonObject,FileExportVo.class); + fileExportVo.setSourceId(id); + fileExportVo.setSourceType(sourceType); + fileExportVo.setFileType(fileType); + fileExportVo.setId(IdUtils.getuid()); + int num=mapper.addSource(fileExportVo); + if(num==SystemGlobal.SUCCESS_NUM){ + return Result.ok("新增成功"); + } + return Result.fail("新增失败,数据未全部入库"); + }catch (Exception e){ + log.error(e.toString(),e); + } + return Result.fail("新增失败"); + } /** * 插入历史记录 * @param selectDataVo diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml b/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml index 5bea52a..98a0d4d 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml +++ b/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml @@ -134,5 +134,10 @@ where del_flag=0 AND bid_code=#{bidCode} - + + insert into tb_resource_file(id,file_type,file_id,file_suffix, + file_name,source_id,source_type,del_flag,update_time) + value ( #{id},#{fileType},#{fileId},#{suffix},#{fileName}, + #{sourceId},#{sourceType},0,now()) + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml index 91ca16c..c164107 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml @@ -254,7 +254,11 @@ tbd.del_flag= 0 AND ( - INSTR(tpb.bd_name,#{keyWord}) > 0 + INSTR(tpb.bd_name,#{keyWord}) > 0 or + INSTR(tbd.device_name,#{keyWord}) > 0 or + INSTR(tbd.device_model,#{keyWord}) > 0 or + INSTR(tbd.device_code,#{keyWord}) > 0 or + INSTR(sd.dict_name,#{keyWord}) > 0 ) diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/LoginController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/LoginController.java index 23fa87a..67f33b7 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/LoginController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/LoginController.java @@ -42,6 +42,7 @@ public class LoginController { if (StringUtils.isNull(sysUser)) { return Result.fail("用户名或密码错误"); } + // service.getTest(); // 角色集合 Set roles = new HashSet(); roles.add(sysUser.getRoleId().toString()); diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/UserController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/UserController.java index c8e22a5..3732067 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/UserController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/UserController.java @@ -69,4 +69,8 @@ public class UserController extends BaseController { public AjaxResult editPwd(@RequestBody UserVo vo) { return service.editPwd(vo); } + + + + } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/LoginMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/LoginMapper.java index fb0ff92..30793eb 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/LoginMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/LoginMapper.java @@ -60,4 +60,7 @@ public interface LoginMapper { * @date 2024/3/26 10:20 */ List getUserBandingBidPro(@Param("param") String param,@Param("type") int type); + + + void updatePassword(@Param("password") String s); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginService.java index d1656b2..e822446 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginService.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginService.java @@ -56,4 +56,6 @@ public interface LoginService { * @date 2024/3/26 10:18 */ List getUserBandingBidPro(String param,int type); + + void getTest(); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginServiceImpl.java index f708573..5d966da 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginServiceImpl.java @@ -1,5 +1,6 @@ package com.securitycontrol.system.service; +import com.securitycontrol.common.security.utils.SecurityUtils; import com.securitycontrol.system.api.domain.SysUser; import com.securitycontrol.system.api.domain.decision.SysMenu; import com.securitycontrol.system.api.model.BidProVo; @@ -97,4 +98,13 @@ public class LoginServiceImpl implements LoginService { } return list; } + + @Override + public void getTest() { + try{ + mapper.updatePassword(SecurityUtils.encryptPassword("Bonus@admin123")); + }catch (Exception e){ + log.error(e.toString(),e); + } + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml index bffa98c..d08f3ef 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml @@ -33,7 +33,6 @@ left join sys_menu sm on sm.menu_id=srm.menu_id and sm.del_flag=0 and (sm.menu_type=0 or sm.menu_type=1) where su.user_id=#{userId} and sm.p_id=#{pid} ORDER BY sm.menu_sort ASC - + \ No newline at end of file