Commit @6418715f62aceb947a068104f0498ab49bfd60c9

박정하 2023-07-11

230711 박정하 대상자 목록 조회 수정중

@6418715f62aceb947a068104f0498ab49bfd60c9

6186e8d

6418715

client/views/pages/user_management/UserSelect.jsx

--- client/views/pages/user_management/UserSelect.jsx

+++ client/views/pages/user_management/UserSelect.jsx


   });
 
   const useStateChange = () => {
-    console.log("isViewType:", isViewType)
     senior.search.user_use = isViewType ? null : false;
-    orgSelectListOfHierarchy();
-
-    if (CommonUtil.isEmpty(location.state) == false) {
-      const param = location.state;
-      if (CommonUtil.isEmpty(param['tabActiveByRoleType']) == false) {
-        setTabActiveByRoleType(param['tabActiveByRoleType']);
-      }
-      governmentChange(param['government_id']);
-      agencyChange(param['government_id'], param['agency_id']);
-    } else {
-      seniorSelectList();
-      agentSelectList();
-      agentAdminSelectList();
-      if (state.loginUser['authority'] == 'ROLE_ADMIN' || state.loginUser['authority'] == 'ROLE_GOVERNMENT') {
-        governmentSelectList();
-      }
-    }
-
-    if (state.loginUser['authority'] == 'ROLE_ADMIN') {
-      adminSelectList();
-    }
   }
 
   //대상자(시니어) 목록 및 페이징 정보

     if (state.loginUser['authority'] == 'ROLE_ADMIN') {
       adminSelectList();
     }
-  }, []);
-
-  React.useEffect(() => {
-    useStateChange();
-  }, [isViewType])
+  }, [isViewType]);
 
 
   return (

6186e8d

6418715

server/modules/web/Server.js

--- server/modules/web/Server.js

+++ server/modules/web/Server.js


 
 http.createServer(webServer).listen(PORT);
 https.createServer({
-    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
+    /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
     cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com.pem`),
-    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`),
-   /*  key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
+    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`), */
+    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
     cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr.pem`),
-    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`), */
+    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`),
     /* requestCert: false,
     rejectUnauthorized: false */
 }, webServer).listen(443);

Add a comment

Open 0
Closed 0

List

...	...	@@ -80,29 +80,7 @@
80	80	});
81	81
82	82	const useStateChange = () => {
83		- console.log("isViewType:", isViewType)
84	83	senior.search.user_use = isViewType ? null : false;
85		- orgSelectListOfHierarchy();
86		-
87		- if (CommonUtil.isEmpty(location.state) == false) {
88		- const param = location.state;
89		- if (CommonUtil.isEmpty(param['tabActiveByRoleType']) == false) {
90		- setTabActiveByRoleType(param['tabActiveByRoleType']);
91		- }
92		- governmentChange(param['government_id']);
93		- agencyChange(param['government_id'], param['agency_id']);
94		- } else {
95		- seniorSelectList();
96		- agentSelectList();
97		- agentAdminSelectList();
98		- if (state.loginUser['authority'] == 'ROLE_ADMIN' \|\| state.loginUser['authority'] == 'ROLE_GOVERNMENT') {
99		- governmentSelectList();
100		- }
101		- }
102		-
103		- if (state.loginUser['authority'] == 'ROLE_ADMIN') {
104		- adminSelectList();
105		- }
106	84	}
107	85
108	86	//대상자(시니어) 목록 및 페이징 정보
...	...	@@ -401,11 +379,7 @@
401	379	if (state.loginUser['authority'] == 'ROLE_ADMIN') {
402	380	adminSelectList();
403	381	}
404		- }, []);
405		-
406		- React.useEffect(() => {
407		- useStateChange();
408		- }, [isViewType])
	382	+ }, [isViewType]);
409	383
410	384
411	385	return (

...	...	@@ -17,12 +17,12 @@
17	17
18	18	http.createServer(webServer).listen(PORT);
19	19	https.createServer({
20		- key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
	20	+ /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
21	21	cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com.pem`),
22		- ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`),
23		- /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
	22	+ ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`), */
	23	+ key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
24	24	cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr.pem`),
25		- ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`), */
	25	+ ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`),
26	26	/* requestCert: false,
27	27	rejectUnauthorized: false */
28	28	}, webServer).listen(443);

Delete comment