添加上锁人选择；移除冗余代码

app/src/main/java/com/grkj/iscs/MyApplication.kt

@@ -24,9 +24,7 @@ class MyApplication : Application() {
         NetHttpManager.getInstance().initCtx(this)
         Token.clear(this)
         // TODO 方便调试，待删除
-        NetApi.login {
-
-        }
+        NetApi.login()
     }
 
     override fun attachBaseContext(base: Context?) {

app/src/main/java/com/grkj/iscs/activity/CreateTicketActivity.kt

@@ -44,6 +44,12 @@ class CreateTicketActivity : BaseMvpActivity<ICreateTicketView, CreateTicketPres
         })
     }
 
+    override fun updateLockerList(lockerList: List<String>?) {
+        lockerList?.let {
+            mBinding?.siPersonLock?.mOptionList = it as MutableList<String>
+        }
+    }
+
     override fun initPresenter(): CreateTicketPresenter {
         return CreateTicketPresenter()
     }

app/src/main/java/com/grkj/iscs/iview/ICreateTicketView.kt

@@ -6,4 +6,6 @@ import com.grkj.iscs.model.vo.SopPageVO
 interface ICreateTicketView : IView {
 
     fun showSopList(sopList: MutableList<SopPageVO.Record>)
+
+    fun updateLockerList(lockerList: List<String>?)
 }

app/src/main/java/com/grkj/iscs/model/AreaTree.kt

@@ -1,3 +0,0 @@
-package com.grkj.iscs.model
-
-data class AreaTree(val data: Any?)

app/src/main/java/com/grkj/iscs/model/UrlConsts.kt

@@ -32,9 +32,8 @@ object UrlConsts {
      */
     const val SOP_INFO = "/iscs/sop/selectIsSopById"
 
-
     /**
-     * 获取地区树
+     * 获取用户列表 - 上锁人
      */
-    const val SYSTEM_AREA = "/app-api/system/area/tree"
+    const val USER_LIST = "/system/user/list"
 }

app/src/main/java/com/grkj/iscs/model/vo/UserListVO.kt

@@ -0,0 +1,40 @@
+package com.grkj.iscs.model.vo
+
+data class UserListVO(
+    val code: Int,
+    val msg: String,
+    val rows: List<Row>,
+    val total: Int
+) {
+    data class Row(
+        val admin: Boolean,
+        val avatar: String,
+        val createBy: String,
+        val createTime: String,
+        val delFlag: String,
+        val dept: Dept,
+        val deptId: String,
+        val email: String,
+        val loginDate: Long,
+        val loginIp: String,
+        val nickName: String,
+        val params: ParamsX,
+        val phonenumber: String,
+        val remark: String,
+        val roles: List<Any?>,
+        val sex: String,
+        val status: String,
+        val userId: String,
+        val userName: String
+    ) {
+        data class Dept(
+            val children: List<Any?>,
+            val deptId: String,
+            val deptName: String,
+            val leader: String,
+            val params: ParamsX
+        )
+
+        class ParamsX
+    }
+}

app/src/main/java/com/grkj/iscs/presenter/CreateTicketPresenter.kt

@@ -24,6 +24,10 @@ class CreateTicketPresenter : BasePresenter<ICreateTicketView>() {
                 mvpView?.showSopList(mSopList)
             }
         }
+
+        NetApi.getUserList(0, 10) {
+            mvpView?.updateLockerList(it?.rows?.map { it.nickName })
+        }
     }
 
     fun getAutoCode(callBack: (String?) -> Unit) {

app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -1,18 +1,18 @@
 package com.grkj.iscs.util
 
 import com.grkj.iscs.MyApplication
-import com.grkj.iscs.model.AreaTree
 import com.grkj.iscs.model.Token
 import com.grkj.iscs.model.UrlConsts
 import com.grkj.iscs.model.vo.SopInfoVO
 import com.grkj.iscs.model.vo.SopPageVO
 import com.grkj.iscs.model.vo.TicketTypeVO
+import com.grkj.iscs.model.vo.UserListVO
 
 /**
  * 网络请求
  */
 object NetApi {
-    fun login(callBack: (AreaTree?) -> Unit) {
+    fun login() {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.SIGN_IN,
             false,
@@ -80,4 +80,19 @@ object NetApi {
                 }
             }, isGet = true, isAuth = true)
     }
+
+    fun getUserList(pageNum: Int, pageSize: Int, callBack: (UserListVO?) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.USER_LIST,
+            false,
+            mapOf(
+                "pageNum" to pageNum,
+                "pageSize" to pageSize
+            ),
+            { res, errMsg, codeInt ->
+                res?.let {
+                    callBack.invoke(it.toBean(UserListVO::class.java))
+                }
+            }, isGet = true, isAuth = true)
+    }
 }