Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/java/com/ibeetl/jlw/service/CoreUserWxService.java

@@ -150,7 +150,7 @@ public class CoreUserWxService extends CoreBaseService<CoreUserWx>{
     public CoreUserWx getInfo (Long wxId){
         CoreUserWxQuery coreUserWxQuery = new CoreUserWxQuery();
         coreUserWxQuery.setWxId(wxId);
-        List<CoreUserWx> list = coreUserWxDao.getValuesByQuery(coreUserWxQuery);
+        List<CoreUserWx> list = coreUserWxDao.getValuesByQueryNotWithPermission(coreUserWxQuery);
         if(null != list && list.size()>0){
             return list.get(0);
         }else{
@@ -159,7 +159,7 @@ public class CoreUserWxService extends CoreBaseService<CoreUserWx>{
     }
 
     public CoreUserWx getInfo (CoreUserWxQuery coreUserWxQuery){
-        List<CoreUserWx> list = coreUserWxDao.getValuesByQuery(coreUserWxQuery);
+        List<CoreUserWx> list = coreUserWxDao.getValuesByQueryNotWithPermission(coreUserWxQuery);
         if(null != list && list.size()>0){
             return list.get(0);
         }else{

web/src/main/java/com/ibeetl/jlw/web/ResourcesApplicationController.java

@@ -80,34 +80,6 @@ public class ResourcesApplicationController{
         return view;
     }
 
-    /**
-    *@author 姚丹
-    *@data 2022/11/29
-     * 应用管理端管理
-     */
-    @GetMapping(MODEL + "/indexAdmin.do")
-    @Function("resourcesApplication.query")
-    @ResponseBody
-    public ModelAndView indexAdmin() {
-        ModelAndView view = new ModelAndView("/jlw/resourcesApplication/indexAdmin.html") ;
-        view.addObject("search", ResourcesApplicationQuery.class.getName());
-        return view;
-    }
-
-    /**
-     *@author 姚丹
-     *@data 2022/11/29
-     * 第三方应用管理
-     */
-    @GetMapping(MODEL + "/indexOther.do")
-    @Function("resourcesApplication.query")
-    @ResponseBody
-    public ModelAndView indexOther() {
-        ModelAndView view = new ModelAndView("/jlw/resourcesApplication/indexOther.html") ;
-        view.addObject("search", ResourcesApplicationQuery.class.getName());
-        return view;
-    }
-
     /* 后台接口 */
     @PostMapping(MODEL + "/list.json")
     @Function("resourcesApplication.query")

web/src/main/java/com/ibeetl/jlw/web/StudentClientLinkController.java

@@ -89,6 +89,7 @@ public class StudentClientLinkController{
 
     /* 后台页面 */
 
+    /*导航栏管理*/
     @GetMapping(MODEL + "/index.do")
     @Function("studentClientLink.query")
     @ResponseBody
@@ -149,6 +150,33 @@ public class StudentClientLinkController{
         view.addObject("search", StudentClientLinkQuery.class.getName());
         return view;
     }
+    /**
+     *@author 姚丹
+     *@data 2022/11/29
+     * 应用管理端管理
+     */
+    @GetMapping(MODEL + "/applicationAdmin.do")
+    @Function("studentClientLink.query")
+    @ResponseBody
+    public ModelAndView applicationAdmin() {
+        ModelAndView view = new ModelAndView("/jlw/studentClientLink/applicationAdmin.html") ;
+        view.addObject("search", StudentClientLinkQuery.class.getName());
+        return view;
+    }
+
+    /**
+     *@author 姚丹
+     *@data 2022/11/29
+     * 第三方应用管理
+     */
+    @GetMapping(MODEL + "/applicationOther.do")
+    @Function("studentClientLink.query")
+    @ResponseBody
+    public ModelAndView applicationOther() {
+        ModelAndView view = new ModelAndView("/jlw/studentClientLink/applicationOther.html") ;
+        view.addObject("search", StudentClientLinkQuery.class.getName());
+        return view;
+    }
 
     /* 后台接口 */
 

web/src/main/resources/static/js/jlw/studentClientLink/applicationOtherPage/add.js

@@ -0,0 +1,38 @@
+layui.define([ 'form', 'laydate', 'table','studentClientLinkApi'], function(exports) {
+    var form = layui.form;
+    var studentClientLinkApi = layui.studentClientLinkApi;
+    var index = layui.index;
+    var view = {
+        init:function(){
+            Lib.initGenrealForm($("#addForm"),form);
+            this.initSubmit();
+        },
+        initSubmit:function(){
+            $("#addButton").click(function(){
+                 form.on('submit(form)', function(){
+                     var studentClientLinkId = $("#addForm input[name='studentClientLinkId']").val();
+                     if(!$.isEmpty(studentClientLinkId)){
+                         studentClientLinkApi.updateStudentClientLink($('#addForm'),function(){
+                             parent.window.dataReload();
+                             Common.info("更新成功");
+                             Lib.closeFrame();
+                         });
+                     }else{
+                         studentClientLinkApi.addStudentClientLink($('#addForm'),function(){
+                             parent.window.dataReload();
+                             Common.info("添加成功");
+                             Lib.closeFrame();
+                         });
+                     }
+
+                });
+            });
+        
+            $("#addButton-cancel").click(function(){
+                Lib.closeFrame();
+            });
+        }
+    			
+    }
+    exports('add',view);
+});