수정

style24.admin/src/main/java/com/style24/admin/biz/service/TsaSystemService.java

@@ -54,9 +54,6 @@ public class TsaSystemService {
 	 */
 	@Transactional("shopTxnManager")
 	public void deleteUserList(Collection<User> userList) {
-		if (userList == null || userList.isEmpty())
-			throw new IllegalStateException(message.getMessage("FAIL_1001"));
-
 		for (User user : userList) {
 			user.setUpdNo(TsaSession.getInfo().getUserNo());
 			systemDao.deleteUser(user);

style24.admin/src/main/java/com/style24/admin/biz/web/TsaBusinessController.java

@@ -30,7 +30,7 @@ import com.gagaframework.web.rest.server.GagaResponse;
 /**
  * 영업관리 Controller
  *
- * @author jaewonHo
+ * @author gagamel
  * @since 2020. 10. 14
  */
 @Controller

style24.admin/src/main/java/com/style24/admin/biz/web/TsaSystemController.java

@@ -123,7 +123,11 @@ public class TsaSystemController extends TsaBaseController {
 	@PostMapping("/user/list/delete")
 	@ResponseBody
 	public GagaResponse deleteUserList(@RequestBody Collection<User> userList) {
+		if (userList == null || userList.isEmpty())
+			throw new IllegalStateException(message.getMessage("FAIL_1001"));
+
 		systemService.deleteUserList(userList);
+
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
 
@@ -208,10 +212,10 @@ public class TsaSystemController extends TsaBaseController {
 	 */
 	@PostMapping("/user/password/change")
 	@ResponseBody
-	public GagaResponse sendUserTemporaryPassword(@RequestBody User user) {
+	public GagaResponse changePassword(@RequestBody User user) {
 		user.setPasswd(passwordEncoder.encode(user.getPasswd()));
 		user.setUpdNo(TsaSession.getInfo().getUserNo());
-		log.debug("user: {}", user);
+		log.info("user: {}", user);
 
 		// 어드민사용자 비밀번호 수정
 		systemService.updateUserPassword(user);
@@ -252,6 +256,21 @@ public class TsaSystemController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
+	/**
+	 * 비밀번호 변경 팝업
+	 * @return
+	 * @author gagamel
+	 * @since 2020. 10. 30
+	 */
+	@GetMapping("/password/change/form")
+	public ModelAndView passwordChangeForm() {
+		ModelAndView mav = new ModelAndView();
+
+		mav.setViewName("system/PasswordChangeForm");
+
+		return mav;
+	}
+
 	/**
 	 * 메뉴관리 화면
 	 * @return

style24.admin/src/main/webapp/WEB-INF/views/envset/ClauseDetailForm.html

@@ -158,7 +158,7 @@
 </div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020102902"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2020102904"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=20201030"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// 저장
@@ -181,11 +181,9 @@
 		});
 	});
 	
-	// Get a summernote options
-	let snOptions = gagaSn.getToolbarOptions();
-	
 	$(document).ready(function() {
 		// Create a summernote
+		let snOptions = gagaSn.getToolbarOptions();
 		gagaSn.createSummernote(snOptions, '#clauseContent');
 	});
 /*]]>*/

style24.admin/src/main/webapp/ux/plugins/gaga/gaga.summernote.js

@@ -81,7 +81,7 @@ var gagaSn = {
 			lang : 'ko-KR', //기본 언어 인코딩
 			fontNames: ['Malgun Gothic', 'HY견고딕', 'Helvetica', 'Verdana', 'Arial', 'Arial Black'], //폰트 스타일
 			fontNamesIgnoreCheck: ['Malgun Gothic'], //기본폰트 스타일
-			focus: true, //로드시 에디터창에 포커싱
+			focus: false, //로드시 에디터창에 포커싱
 			fontSizes: ['8','9','10','11','12','13','14','15','16','17','18','19','20','24','30','36'],
 			toolbar: toolbarOptions,
 			callbacks: {

style24.admin/src/main/webapp/ux/plugins/summernote/summernote.js

@@ -10238,9 +10238,8 @@ external_root_jQuery_commonjs2_jquery_commonjs_jquery_amd_jquery_default.a.summe
 
 
 
-/* 이모티콘/이모지 : Emoji js ===================================================================================================*/
+/* 이모티콘 : Emoji js ===================================================================================================*/
 
-/*
 (function (factory) {
     if (typeof define === 'function' && define.amd) {
         define(['jquery'], factory);
@@ -10387,14 +10386,14 @@ external_root_jQuery_commonjs2_jquery_commonjs_jquery_amd_jquery_default.a.summe
         }
     });
 }));
-*/
+/* //이모티콘 ============================================================================================*/
 
 
 
 
 
 /* 프린트 : Print js ===================================================================================================*/
-/*
+
 (function (factory) {
     // global define
     if (typeof define === 'function' && define.amd) {
@@ -10432,7 +10431,7 @@ external_root_jQuery_commonjs2_jquery_commonjs_jquery_amd_jquery_default.a.summe
 
         //@param {Object} context - context object has status of editor.
         'print': function (context) {
-            var self = this;E
+            var self = this;
 
             // ui has renders to build ui elements.
             //  - you can create a button with `ui.button`
@@ -10508,4 +10507,7 @@ external_root_jQuery_commonjs2_jquery_commonjs_jquery_amd_jquery_default.a.summe
         }
     });
 }));
-//프린트 ===================================================================================================*/
+
+/* //프린트 ===================================================================================================*/
+
+