伊利项目-设计器页面版本差异查看

This commit is contained in:
qinoy 2022-09-07 17:54:08 +08:00
parent f6f11a5df2
commit 9f14194b8b
21 changed files with 70 additions and 60 deletions

View File

@ -1,4 +1,4 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/favicon.ico><title>com.actionsoft.apps.coe.pal.cooperation</title><script src=../commons/awsui/js/icon.array.js></script><script>const settingParam = <#settingParam>; <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/favicon.ico><title>com.actionsoft.apps.coe.pal.cooperation</title><script src=../commons/awsui/js/icon.array.js></script><script>const settingParam = <#settingParam>;
const axiosBaseUrl = "./"; const axiosBaseUrl = "./";
const production = true;</script><script>var mainPage = "<#mainPage>"; const production = true;</script><script>var mainPage = "<#mainPage>";
var isManage = <#isManage>;</script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-1d20f052.edcf9729.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-1e6eef21.91078ea1.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-3dabd524.8c979cf0.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-1d20f052.d0bacde3.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-1e6eef21.99b71b5a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2d224ef1.984121a8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3dabd524.fe438c98.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-bf7921b8.4102364d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.a647ef2c.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.f88a1bfe.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.c262f4c0.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.a647ef2c.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.c262f4c0.js></script><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.f88a1bfe.js></script></body></html> var isManage = <#isManage>;</script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-1e4c4730.ba9d65b0.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-36a984ec.edcf9729.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-3fc8dcbc.8c979cf0.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-1e4c4730.82677209.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2d224ef1.2691561f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-36a984ec.7e3377e3.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3fc8dcbc.8c7efaae.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.46f1e390.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.bc4409f3.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.bc4409f3.js></script><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.46f1e390.js></script></body></html>

View File

@ -1 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),i=t("0f08"),o=t("4360");i["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误"+e.msg):(o["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"+mainPage))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("0b56"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]); (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),i=t("0f08"),o=t("4360");i["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误"+e.msg):(o["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"+mainPage))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("2877"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);

View File

@ -408,7 +408,7 @@ public class BPMOrgTreeWeb extends ActionWeb {
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
result = userModelList.stream() result = userModelList.stream()
.filter(userModel -> userModel.getUserName().equals(userName)) .filter(userModel -> userModel.getUserName().contains(userName))
.map(UserModel::getUID) .map(UserModel::getUID)
.collect(Collectors.toList()); .collect(Collectors.toList());
ro.setData(result); ro.setData(result);
@ -419,16 +419,21 @@ public class BPMOrgTreeWeb extends ActionWeb {
public String searchParentUserId(String userid){ public String searchParentUserId(String userid){
ResponseObject ro = ResponseObject.newOkResponse(); ResponseObject ro = ResponseObject.newOkResponse();
DepartmentModel departmentByUser = SDK.getORGAPI().getDepartmentByUser(userid); if (UtilString.isEmpty(userid)) {
return ResponseObject.newErrResponse("参数错误").toString();
String pathIdStr = departmentByUser.getPathIdOfCache(); }
String[] pathIds = pathIdStr.split("/"); String[] userIds = userid.split(",");
Set<String> result = new HashSet<>();
List datalist=new ArrayList<>(Arrays.asList(pathIds)); Arrays.stream(userIds).forEach(userId -> {
datalist.add(userid); DepartmentModel departmentByUser = SDK.getORGAPI().getDepartmentByUser(userId);
String pathIdStr = departmentByUser.getPathIdOfCache();
datalist.add(departmentByUser.getCompanyId()); String[] pathIds = pathIdStr.split("/");
ro.setData(datalist); List datalist=new ArrayList<>(Arrays.asList(pathIds));
datalist.add(userId);
datalist.add(departmentByUser.getCompanyId());
result.addAll(datalist);
});
ro.setData(result);
return ro.toString(); return ro.toString();
} }