Commit Graph
1429 Commits
Author SHA1 Message Date
hufangzhou 39c6457675 * Code for task #89847. 2023-04-06 13:33:46 +08:00
liumengyi bba7fa92d7 * Finish task #89846. 2023-04-06 13:25:29 +08:00
liumengyi 48048085c9 * Finish task #89846. 2023-04-06 10:55:05 +08:00
hufangzhou 3c83d94e09 * Merge code. 2023-04-06 09:01:30 +08:00
王怡栋 e1933a9b50 Merge branch 'daitingting_task_#89954' into 'master'
* Finish task #89954.

See merge request easycorp/zentaopms!7313
2023-04-06 00:54:46 +00:00
liumengyi 08e4ae2e2e Code for task #89846. 2023-04-05 23:30:40 +08:00
tianshujie 1e77c10378 * Code for task #89915. 2023-04-05 15:54:25 +08:00
hufangzhou bbe679c233 * Finish task #89840. 2023-04-05 13:23:24 +08:00
hufangzhou 42419e8b09 * Finish task #89843. 2023-04-05 12:47:11 +08:00
liumengyi b4a88a69f5 * Code for task #89846. 2023-04-05 12:08:58 +08:00
liumengyi a0bdcd3f52 8 Finish task #89846. 2023-04-04 17:27:44 +08:00
daitingting 6c331dc642 * Finish task #89954. 2023-04-04 16:19:43 +08:00
liumengyi 6f8390a091 * Code for manage priv. 2023-04-04 15:58:01 +08:00
liumengyi 543e719155 * Code for manage priv. 2023-04-04 14:04:17 +08:00
hufangzhou ed1e738bf0 * Adjust the function to adapt to the new database structure. 2023-04-04 13:57:31 +08:00
liugang 56dc716e6e + Add privilege of annualData. 2023-04-04 02:57:45 +00:00
hufangzhou 8e866b066f * Adjust the function to adapt to the new database structure. 2023-04-04 10:42:25 +08:00
liumengyi f1362b9010 * Fix bug of getPrivManagerPairs. 2023-04-04 10:13:44 +08:00
hufangzhou c61bf7893b * Adjust the function to adapt to the new database structure. 2023-04-04 10:01:12 +08:00
liumengyi 2d24383857 + Add method to get view and module language. 2023-04-04 09:13:31 +08:00
liugang 07a3a4c3da * Remove annualData privilege. 2023-04-04 01:12:11 +00:00
liugang 7d919baf3c * Sort the privileges of pivot module, finish task #90073. 2023-04-03 09:27:29 +00:00
liumengyi 12c3a03287 * Fix bug of task #89848. 2023-04-03 17:16:05 +08:00
liumengyi 25bb508e77 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-03 17:10:36 +08:00
liumengyi 3658bbe634 * Finish task #89848. 2023-04-03 17:05:36 +08:00
hufangzhou 932a524e8d * Init data for priv package. 2023-04-03 16:39:19 +08:00
王怡栋 6147360f3b Merge branch 'daitingting_task_#89952' into 'master'
* Finish task #89952.

See merge request easycorp/zentaopms!7292
2023-04-03 06:35:38 +00:00
王怡栋 511a5fb0bd Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7293
2023-04-03 06:29:21 +00:00
daitingting 26161924c6 * Finish task #89952. 2023-04-03 14:19:49 +08:00
tianshujie baf5aeba2a * Code for task #89927. 2023-04-03 13:34:21 +08:00
liugang 2336997c39 * Sort the privileges of screen, finish task #90070,90071, cost 1h, left 0h. 2023-04-03 05:33:36 +00:00
tianshujie 3f9f9fbc5b * Code for task #89927. 2023-04-03 11:26:01 +08:00
liumengyi d3cf4b54f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_295 2023-04-03 09:58:23 +08:00
qixinzhi 284a4ccfae * Finish task#88964. 2023-03-30 14:19:26 +08:00
hufangzhou 4592245949 * Add modules. 2023-03-24 05:19:11 +00:00
hufangzhou 8d9abf2861 * Add the project review module. 2023-03-24 02:36:19 +00:00
hufangzhou c43e81abdc * Fix bugs. 2023-03-24 01:59:14 +00:00
hufangzhou 4ab8d29bc2 * Fix bug that the general module has no priv. 2023-03-24 01:13:10 +00:00
hufangzhou 45123c526a * Add modules. 2023-03-24 00:49:19 +00:00
liumengyi 3fb7c480fb * Add moduleName and methodName for edit system priv. 2023-03-24 08:47:23 +08:00
wangyidong 160e588532 * fix bug #33207. 2023-03-23 17:17:54 +08:00
hufangzhou dff25040c8 * Add modules and change the other module to general module. 2023-03-23 09:10:21 +00:00
liumengyi a455c00747 * Add null for search priv. 2023-03-23 16:25:42 +08:00
liumengyi a41eea8e93 * Fix bug #33236. 2023-03-23 14:24:45 +08:00
liumengyi 089539e550 * Fix bug #33234. 2023-03-23 14:16:16 +08:00
liumengyi 37416d20bb * Fix bug. 2023-03-22 16:23:03 +08:00
liumengyi a7479144e8 * Fix bug #33222. 2023-03-22 16:07:37 +08:00
liumengyi 794120c49f * Fix bug #33218. 2023-03-22 14:50:38 +08:00
hufangzhou b4f5163e1c * Add the sort rule for priv package card view. 2023-03-22 05:42:46 +00:00
liumengyi 32232268a6 * Fix bug of search privs. 2023-03-21 07:37:50 +00:00